diff options
| author | Colin Cross <ccross@android.com> | 2022-01-10 21:16:59 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2022-01-11 19:23:50 -0800 |
| commit | c1309ecfbab7d107f837e8f67d664a0d21b9174e (patch) | |
| tree | 05315e2a2619accf5e6c36e27de3eb5535a16139 /test-runner | |
| parent | f7a327e8d5849f732739b7a59de18f678c76efbb (diff) | |
| download | base-c1309ecfbab7d107f837e8f67d664a0d21b9174e.tar.gz | |
Fix incorrect licenses in frameworks/base
SPDX-license-identifier-GPL and SPDX-license-identifier-W3C are
false positives in the detector in binary files.
libs/usb/test/accessorytest/f_accessory.h is an original kernel
header file with GPL 2.0 license. Replace it with the file from
libs/usb/tests/AccessoryChat/accessorychat/linux/usb/f_accessory.h,
which is the same header after running it through bionic's script
to remove copyrightable information from the header.
Move CPL license into test-runner/ and test-base/ where it is
used.
Test: m checkbuild
Change-Id: I09e760d02b3712d5a8d225ce4cff6515c9f3c5e1
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/Android.bp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 0f56bb3819f1..2a19af9f8cd2 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -18,12 +18,19 @@ // ===================================== package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_base_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-CPL-1.0 - default_applicable_licenses: ["frameworks_base_license"], + default_applicable_licenses: ["frameworks_base_test-runner_license"], +} + +license { + name: "frameworks_base_test-runner_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-CPL-1.0", + ], + license_text: [ + "src/junit/cpl-v10.html", + ], } java_sdk_library { |