diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-05 20:24:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 20:24:51 +0000 |
| commit | 24dc51072489a7289af0c12b753834b6d34f682d (patch) | |
| tree | 4970ffc8dcce27c03dd6178a37826b7f17c93aaf | |
| parent | 9c2445fdd4fc672f7f3fdee936bcb84fb784e79f (diff) | |
| parent | 3aab3d03c3947839692fef29bf300b1f9dc3edb0 (diff) | |
| download | DeskClock-24dc51072489a7289af0c12b753834b6d34f682d.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/DeskClock" am: 3aab3d03c3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/1576171
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5b5d68aa80ab470244f3ef05af840c46e8725262
| -rw-r--r-- | Android.bp | 17 | ||||
| -rw-r--r-- | tests/Android.bp | 8 |
2 files changed, 25 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index f0a26b248..4aa839e55 100644 --- a/Android.bp +++ b/Android.bp @@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["packages_apps_DeskClock_license"], +} + +// Added automatically by a large-scale-change +// http://go/android-license-faq +license { + name: "packages_apps_DeskClock_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + android_app { name: "DeskClock", resource_dirs: ["res"], diff --git a/tests/Android.bp b/tests/Android.bp index c8e807e6b..2bfdfed5a 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_DeskClock_license": + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_DeskClock_license"], +} + android_test { name: "DeskClockTests", libs: [ |