summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2022-01-26 04:40:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-26 04:40:35 +0000
commitd58fc6b1d7953df8b96ebdc07d02adaaad0cdaba (patch)
treefb94f453a0afe4033192eeaf803da25e92e556a2
parenta39b0e1690508dda81ac1d8094cb8678e232f28f (diff)
parent28d02e2a806694ebb91412f0750bdd052957451c (diff)
downloadgs101-d58fc6b1d7953df8b96ebdc07d02adaaad0cdaba.tar.gz
Fix license texts. am: c721eef957 am: 64f6d7cf1b am: d99f0709db am: 28d02e2a80
Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/1960730 Change-Id: Ia4c864914e685ee2cd7de9554bbe730cd807b238
-rw-r--r--Android.bp14
-rw-r--r--libacryl_plugins/Android.bp6
2 files changed, 3 insertions, 17 deletions
diff --git a/Android.bp b/Android.bp
index a657ade..9d70070 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,16 +3,6 @@ soong_namespace {
}
package {
- default_applicable_licenses: ["hardware_google_graphics_gs101_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
- name: "hardware_google_graphics_gs101_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- ],
- // large-scale-change unable to identify any license_text files
+ // See: http://go/android-license-faq
+ default_applicable_licenses: ["Android-Apache-2.0"],
}
diff --git a/libacryl_plugins/Android.bp b/libacryl_plugins/Android.bp
index f8d58a0..9463723 100644
--- a/libacryl_plugins/Android.bp
+++ b/libacryl_plugins/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_graphics_gs101_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["hardware_google_graphics_gs101_license"],
+ default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_library {