summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2022-01-26 03:57:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-26 03:57:46 +0000
commit64f6d7cf1bba2443fb2a8d240ea7a3cbe94dd4f7 (patch)
treefb3ac25864a0f6be3d44720e7efba4404d742ddd
parent7942ec4f7e4da927e6e99251509e96ec42d657d5 (diff)
parentc721eef95790024244d2a43167b7ef3857d797bb (diff)
downloadgs101-64f6d7cf1bba2443fb2a8d240ea7a3cbe94dd4f7.tar.gz
Fix license texts. am: c721eef957
Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/1960730 Change-Id: I638253be52e3be69116508cdad2f7da94054dd0b
-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 {