diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-05 21:48:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 21:48:51 +0000 |
| commit | 1068dba4aacdcc1a987aa91150a2898ad73a731d (patch) | |
| tree | d3ae8b5ad33fd16cb1adb7528909bd416dc093f6 | |
| parent | 37ae78c4ad6e9ed1132eaedaf96a7b9a606d0ce6 (diff) | |
| parent | 5ef76d204dff1cc238d5965ab46103e571a3abdb (diff) | |
| download | LegacyCamera-1068dba4aacdcc1a987aa91150a2898ad73a731d.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/LegacyCamera" am: 5ef76d204d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/1576150
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34cce8ea5ed17bbc307e1699e17dabb3e7e00b75
| -rw-r--r-- | Android.bp | 17 | ||||
| -rw-r--r-- | jni/Android.bp | 17 | ||||
| -rw-r--r-- | tests/Android.bp | 8 |
3 files changed, 42 insertions, 0 deletions
@@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["packages_apps_LegacyCamera_license"], +} + +// Added automatically by a large-scale-change +// http://go/android-license-faq +license { + name: "packages_apps_LegacyCamera_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + android_app { name: "LegacyCamera", diff --git a/jni/Android.bp b/jni/Android.bp index 4bce5380..3a850013 100644 --- a/jni/Android.bp +++ b/jni/Android.bp @@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["packages_apps_LegacyCamera_jni_license"], +} + +// Added automatically by a large-scale-change +// http://go/android-license-faq +license { + name: "packages_apps_LegacyCamera_jni_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + cc_library_shared { name: "libjni_legacymosaic", diff --git a/tests/Android.bp b/tests/Android.bp index 9467427e..59f0c2b6 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -1,3 +1,11 @@ +package { + // http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // the below license kinds from "packages_apps_LegacyCamera_license": + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_LegacyCamera_license"], +} + android_test { name: "LegacyCameraTests", |