Skip to content

Commit 697f261

Browse files
authored
Merge pull request #5179 from matkatz/usbhost-license
USB Host license
2 parents 777df96 + cb9546c commit 697f261

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

NOTICE

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,20 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
382382
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
383383
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
384384

385+
libusbhost (Apache License, Version 2.0 ), https://android.googlesource.com/platform/system/core/+/master/libusbhost/include/usbhost/usbhost.h
386+
===============================================================================
387+
388+
Copyright (C) 2010 The Android Open Source Project
389+
Licensed under the Apache License, Version 2.0 (the "License");
390+
you may not use this file except in compliance with the License.
391+
You may obtain a copy of the License at
392+
http://www.apache.org/licenses/LICENSE-2.0
393+
Unless required by applicable law or agreed to in writing, software
394+
distributed under the License is distributed on an "AS IS" BASIS,
395+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
396+
See the License for the specific language governing permissions and
397+
limitations under the License.
398+
385399
libusb (LGPL 2.1), https://github.com/libusb/libusb
386400
===============================================================================
387401
GNU LESSER GENERAL PUBLIC LICENSE

scripts/pr_check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function check_folder {
1414
if [[ $(grep -oP "Software License Agreement" $filename | wc -l) -ne 0 ]]; then
1515
echo "[WARNING] $filename contains 3rd-party license agreement"
1616
else
17-
if [[ ! $filename == *"libuvc"* ]]; then
17+
if [[ ! $filename == *"usbhost"* ]]; then
1818
# Only check files that are not .gitignore-d
1919
if [[ $(git check-ignore $filename | wc -l) -eq 0 ]]; then
2020
if [[ $(grep -oP "(?<=\(c\) )(.*)(?= Intel)" $filename | wc -l) -eq 0 ]]; then
@@ -140,4 +140,4 @@ else
140140
fi
141141
fi
142142

143-
exit 0
143+
exit 0

src/usbhost/usbhost.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* License: Apache 2.0. See LICENSE file in root directory. */
2-
/* Copyright(c) 2019 Intel Corporation. All Rights Reserved. */
31
/*
42
* Copyright (C) 2010 The Android Open Source Project
53
*

0 commit comments

Comments
 (0)