diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-20 17:23:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 17:23:03 +0000 |
| commit | ba4493238f059d32bbd2de8ff8bea660e0d720d9 (patch) | |
| tree | 6958bcc76b4425b782d9666f1979589e058108bd | |
| parent | 4553ce0c0572e728b3aec144489d22fa17640802 (diff) | |
| parent | a58e724fbc1e736af8fd7f2c2b8e35230b4d76b8 (diff) | |
| download | Gallery-ba4493238f059d32bbd2de8ff8bea660e0d720d9.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Gallery" am: d6e23e4d83 am: c03fa8b990 am: a58e724fbc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery/+/1588409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic1086ebdb13aa9246527d23b654c14cce3d47405
| -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", |