Fix license texts. am: 4013f2a952 am: 980298d7cb

Original change: https://android-review.googlesource.com/c/platform/hardware/google/interfaces/+/1960301

Change-Id: I9d17d8c075ab718522ae0d4128e4c6f91dc53311

12 files changed, 12 insertions, 67 deletions

diff --git a/Android.bp b/Android.bp
index d97115f..8f0762d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,18 +2,7 @@ soong_namespace {
 }
 
 package {
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "hardware_google_interfaces_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    // large-scale-change unable to identify any license_text files
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 hidl_package_root {
diff --git a/bluetooth/bt_channel_avoidance/1.0/Android.bp b/bluetooth/bt_channel_avoidance/1.0/Android.bp
index 5c7e4cc..5c68b4b 100644
--- a/bluetooth/bt_channel_avoidance/1.0/Android.bp
+++ b/bluetooth/bt_channel_avoidance/1.0/Android.bp
@@ -1,10 +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 "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 hidl_interface {
diff --git a/bluetooth/ccc/1.0/Android.bp b/bluetooth/ccc/1.0/Android.bp
index bb789b5..178a046 100644
--- a/bluetooth/ccc/1.0/Android.bp
+++ b/bluetooth/ccc/1.0/Android.bp
@@ -1,10 +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 "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 hidl_interface {
diff --git a/bluetooth/sar/1.0/Android.bp b/bluetooth/sar/1.0/Android.bp
index e0b6b24..e3194bc 100644
--- a/bluetooth/sar/1.0/Android.bp
+++ b/bluetooth/sar/1.0/Android.bp
@@ -1,10 +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 "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 hidl_interface {
diff --git a/bluetooth/sar/1.1/Android.bp b/bluetooth/sar/1.1/Android.bp
index 05bdb09..8282e87 100644
--- a/bluetooth/sar/1.1/Android.bp
+++ b/bluetooth/sar/1.1/Android.bp
@@ -1,10 +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 "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 hidl_interface {
diff --git a/display/Android.bp b/display/Android.bp
index 5b63f65..1eaac17 100644
--- a/display/Android.bp
+++ b/display/Android.bp
@@ -1,10 +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 "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 aidl_interface {
diff --git a/light/1.0/Android.bp b/light/1.0/Android.bp
index c2e0efb..56ed058 100644
--- a/light/1.0/Android.bp
+++ b/light/1.0/Android.bp
@@ -2,11 +2,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 hidl_interface {
diff --git a/light/1.0/default/Android.bp b/light/1.0/default/Android.bp
index af11738..96e12a3 100644
--- a/light/1.0/default/Android.bp
+++ b/light/1.0/default/Android.bp
@@ -16,11 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_defaults {
diff --git a/light/1.1/Android.bp b/light/1.1/Android.bp
index 8fce321..bf9f1f8 100644
--- a/light/1.1/Android.bp
+++ b/light/1.1/Android.bp
@@ -2,11 +2,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 hidl_interface {
diff --git a/light/1.1/default/Android.bp b/light/1.1/default/Android.bp
index 783e6c2..0b5be36 100644
--- a/light/1.1/default/Android.bp
+++ b/light/1.1/default/Android.bp
@@ -16,11 +16,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 cc_defaults {
diff --git a/media/c2/1.0/Android.bp b/media/c2/1.0/Android.bp
index 3838dc7..62d306f 100644
--- a/media/c2/1.0/Android.bp
+++ b/media/c2/1.0/Android.bp
@@ -2,11 +2,7 @@
 
 package {
     // See: http://go/android-license-faq
-    // A large-scale-change added 'default_applicable_licenses' to import
-    // all of the 'license_kinds' from "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 hidl_interface {
diff --git a/power/Android.bp b/power/Android.bp
index d0972c0..41269ba 100644
--- a/power/Android.bp
+++ b/power/Android.bp
@@ -1,10 +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 "hardware_google_interfaces_license"
-    // to get the below license kinds:
-    //   SPDX-license-identifier-Apache-2.0
-    default_applicable_licenses: ["hardware_google_interfaces_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
 aidl_interface {