diff options
author | Bob Badour <bbadour@google.com> | 2022-01-26 00:51:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-26 00:51:17 +0000 |
commit | 4118c6dc410750ef15c5cec2830504120ecdb3cc (patch) | |
tree | eb5702cf7807f0469279ed974d3849009ecf3cf9 | |
parent | 04b79b6cb0fd105abb4e5fb930aa3eea73eca1e8 (diff) | |
parent | df8d50021b1332c239a68b8ea91fa506929123bc (diff) | |
download | tests-4118c6dc410750ef15c5cec2830504120ecdb3cc.tar.gz |
Fix licenses and license texts. am: a8cd1e6b07 am: 3349375375 am: 6d95223f92 am: df8d50021b
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1960619
Change-Id: I0dd93e95ce2f2bd9963b73f1b25d5054be1b1e51
-rw-r--r-- | Android.bp | 27 | ||||
-rw-r--r-- | devicetree/early_mount/Android.bp | 6 | ||||
-rw-r--r-- | net/test/Android.bp | 7 |
3 files changed, 4 insertions, 36 deletions
@@ -1,29 +1,6 @@ package { - default_applicable_licenses: ["kernel_tests_license"], -} - -// Added automatically by a large-scale-change that took the approach of -// 'apply every license found to every target'. While this makes sure we respect -// every license restriction, it may not be entirely correct. -// -// e.g. GPL in an MIT project might only apply to the contrib/ directory. -// -// Please consider splitting the single license below into multiple licenses, -// taking care not to lose any license_kind information, and overriding the -// default license using the 'licenses: [...]' property on targets as needed. -// -// For unused files, consider creating a 'fileGroup' with "//visibility:private" -// to attach the license to, and including a comment whether the files may be -// used in the current project. -// See: http://go/android-license-faq -license { - name: "kernel_tests_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-OpenSSL", - ], - // large-scale-change unable to identify any license_text files + // See: http://go/android-license-faq + default_applicable_licenses: ["Android-Apache-2.0"], } python_defaults { diff --git a/devicetree/early_mount/Android.bp b/devicetree/early_mount/Android.bp index 6c60e91..01d149e 100644 --- a/devicetree/early_mount/Android.bp +++ b/devicetree/early_mount/Android.bp @@ -14,11 +14,7 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["kernel_tests_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } python_test { diff --git a/net/test/Android.bp b/net/test/Android.bp index cb88ffd..2d789a2 100644 --- a/net/test/Android.bp +++ b/net/test/Android.bp @@ -1,11 +1,6 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "kernel_tests_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-OpenSSL - default_applicable_licenses: ["kernel_tests_license"], + default_applicable_licenses: ["Android-Apache-2.0"], } python_defaults { |