Merge "Fix licenses and license texts."
diff --git a/Android.bp b/Android.bp
index 106ed1e..710f038 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,22 +14,8 @@
//
package {
- default_applicable_licenses: [
- "packages_providers_DownloadProvider_license",
- ],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
- name: "packages_providers_DownloadProvider_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- ],
- license_text: [
- "NOTICE",
- ],
+ // See: http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
}
android_app {
diff --git a/tests/Android.bp b/tests/Android.bp
index d0ba0a5..481e617 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -15,13 +15,7 @@
package {
// See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "packages_providers_DownloadProvider_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: [
- "packages_providers_DownloadProvider_license",
- ],
+ default_applicable_licenses: ["Android-Apache-2.0"],
}
android_test {
diff --git a/tests/permission/Android.bp b/tests/permission/Android.bp
index a96621f..7136f2c 100644
--- a/tests/permission/Android.bp
+++ b/tests/permission/Android.bp
@@ -15,13 +15,7 @@
package {
// See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "packages_providers_DownloadProvider_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: [
- "packages_providers_DownloadProvider_license",
- ],
+ default_applicable_licenses: ["Android-Apache-2.0"],
}
android_test {
diff --git a/tests/public_api_access/Android.bp b/tests/public_api_access/Android.bp
index 3d2cd98..5975ed2 100644
--- a/tests/public_api_access/Android.bp
+++ b/tests/public_api_access/Android.bp
@@ -15,13 +15,7 @@
package {
// See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "packages_providers_DownloadProvider_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: [
- "packages_providers_DownloadProvider_license",
- ],
+ default_applicable_licenses: ["Android-Apache-2.0"],
}
android_test {
diff --git a/ui/Android.bp b/ui/Android.bp
index 04606c2..b8bea03 100644
--- a/ui/Android.bp
+++ b/ui/Android.bp
@@ -15,13 +15,7 @@
package {
// See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "packages_providers_DownloadProvider_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: [
- "packages_providers_DownloadProvider_license",
- ],
+ default_applicable_licenses: ["Android-Apache-2.0"],
}
android_app {