Fix licenses and license texts.
Removed false-positive openssl. Use Android-Apache-2.0 for Apache 2.0
Test: m nothing
Change-Id: I5ed0701531ea16872afbe93b184fa44a573b5fa3
diff --git a/Android.bp b/Android.bp
index 5c20661..e6b4444 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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 {
