diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-20 17:23:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 17:23:08 +0000 |
| commit | 8ed409dd30fbd0892b9636300414a15c63dc34f6 (patch) | |
| tree | 8c5e6acc2fb2b1e33b38ecf45d8366a839e4cb23 | |
| parent | f58758683f5dae82a259d5c09ec2cfe803033650 (diff) | |
| parent | edbeb4d8f0611e61ee709c8c977ff4d8eeb60154 (diff) | |
| download | Music-8ed409dd30fbd0892b9636300414a15c63dc34f6.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Music" am: 1a227ef780 am: c7d79dd39e am: edbeb4d8f0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Music/+/1588384
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If73a5ae952857465c540433aeb6080aa82d31dc5
| -rw-r--r-- | Android.bp | 17 | ||||
| -rw-r--r-- | kotlin/Android.bp | 9 |
2 files changed, 26 insertions, 0 deletions
@@ -1,3 +1,20 @@ +package { + default_applicable_licenses: ["packages_apps_Music_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "packages_apps_Music_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} + android_app { name: "Music", srcs: ["src/**/*.java"], diff --git a/kotlin/Android.bp b/kotlin/Android.bp index 3788111..1eb13de 100644 --- a/kotlin/Android.bp +++ b/kotlin/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_Music_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["packages_apps_Music_license"], +} + android_app { name: "MusicKotlin", srcs: ["src/**/*.kt"], |