diff options
author | Bob Badour <bbadour@google.com> | 2022-01-25 13:36:23 -0800 |
---|---|---|
committer | Bob Badour <bbadour@google.com> | 2022-01-25 20:09:54 -0800 |
commit | 3ef6a3ce549faf53b67d67ca9e22dc4f68dc9072 (patch) | |
tree | 8b56c284e5e071988ef1791a09f8eb8d11ac2427 | |
parent | 143dc110843221ff5dbb3a7e655ed1c7a11e3b3b (diff) | |
download | interfaces-3ef6a3ce549faf53b67d67ca9e22dc4f68dc9072.tar.gz |
Fix license texts.
All the code here is Android 1p.
Test: m nothing
Change-Id: I0339dfd560684ed952160a68b409871e42d9698a
-rw-r--r-- | Android.bp | 13 | ||||
-rw-r--r-- | bluetooth/bt_channel_avoidance/1.0/Android.bp | 6 | ||||
-rw-r--r-- | bluetooth/ccc/1.0/Android.bp | 6 | ||||
-rw-r--r-- | bluetooth/sar/1.0/Android.bp | 6 | ||||
-rw-r--r-- | bluetooth/sar/1.1/Android.bp | 6 | ||||
-rw-r--r-- | bluetooth/sar/1.2/Android.bp | 6 | ||||
-rw-r--r-- | display/Android.bp | 6 | ||||
-rw-r--r-- | light/1.0/Android.bp | 6 | ||||
-rw-r--r-- | light/1.0/default/Android.bp | 6 | ||||
-rw-r--r-- | light/1.1/Android.bp | 6 | ||||
-rw-r--r-- | light/1.1/default/Android.bp | 6 | ||||
-rw-r--r-- | media/c2/1.0/Android.bp | 6 | ||||
-rw-r--r-- | power/Android.bp | 6 |
13 files changed, 13 insertions, 72 deletions
@@ -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/bluetooth/sar/1.2/Android.bp b/bluetooth/sar/1.2/Android.bp index ace9608..623ec68 100644 --- a/bluetooth/sar/1.2/Android.bp +++ b/bluetooth/sar/1.2/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 828b2d8..939ab0a 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 { |