diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-19 00:58:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-19 00:58:42 +0000 |
| commit | c03fa8b9907b25455417820d8181e8a29a81ff6f (patch) | |
| tree | 6958bcc76b4425b782d9666f1979589e058108bd | |
| parent | 9d5406dc05238c72434ba29375e0cb25eb85d21b (diff) | |
| parent | d6e23e4d83ed4b6bad9ff1f5be5aef86392da6ce (diff) | |
| download | Gallery-c03fa8b9907b25455417820d8181e8a29a81ff6f.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Gallery" am: d6e23e4d83
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery/+/1588409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie0db55c93db3227b923963b19e7bcda5593fa8b0
| -rw-r--r-- | Android.bp | 17 | ||||
| -rw-r--r-- | tests/Android.bp | 9 |
2 files changed, 26 insertions, 0 deletions
@@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["packages_apps_Gallery_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "packages_apps_Gallery_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + android_app { name: "Gallery", srcs: ["src/**/*.java"], diff --git a/tests/Android.bp b/tests/Android.bp index e5879ac..53bde64 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "packages_apps_Gallery_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_Gallery_license"], +} + android_test { name: "GalleryTests", certificate: "media", |