summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2022-01-26 04:26:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-26 04:26:27 +0000
commit28d02e2a806694ebb91412f0750bdd052957451c (patch)
tree6e1ea25f335cce476b5bf7b23c6d9ee1283281a9
parentee64a0a29da2b38e98fcfb57bf04ecff98e3dabf (diff)
parentd99f0709dbde6336cc681965f41f3027f3c22083 (diff)
downloadgs101-28d02e2a806694ebb91412f0750bdd052957451c.tar.gz
Fix license texts. am: c721eef957 am: 64f6d7cf1b am: d99f0709db
Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/1960730 Change-Id: I139be10476ca8f3bda48ce4b5028248bba285df0
-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 {