diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 19:41:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 19:41:19 +0000 |
commit | c9848c410ff503d23a939b30a0452d886612cea5 (patch) | |
tree | 49cfc4d8344e7015c625f74f9cf31d83d6283bec | |
parent | 922cf68f86adfb9be8f44a91b3e091f99e0b46c9 (diff) | |
parent | dc1558fd177e918e81aa8e6be468ca8e591b8026 (diff) | |
download | multidex-c9848c410ff503d23a939b30a0452d886612cea5.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to frameworks/multidex am: 8a3cd3ba6c am: 7da62b51cd am: dc1558fd17android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-release
Original change: https://android-review.googlesource.com/c/platform/frameworks/multidex/+/1589002
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac9140b41ac5d645656c4e990f05950ae6456905
-rw-r--r-- | Android.bp | 31 | ||||
-rw-r--r-- | instrumentation/Android.bp | 9 | ||||
-rw-r--r-- | library/Android.bp | 9 |
3 files changed, 49 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..568aa20 --- /dev/null +++ b/Android.bp @@ -0,0 +1,31 @@ +// +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["frameworks_multidex_license"], +} + +// Added automatically by a large-scale-change +// See: http://go/android-license-faq +license { + name: "frameworks_multidex_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + ], + license_text: [ + "NOTICE", + ], +} diff --git a/instrumentation/Android.bp b/instrumentation/Android.bp index e342fa9..7dda1cd 100644 --- a/instrumentation/Android.bp +++ b/instrumentation/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_multidex_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_multidex_license"], +} + genrule { name: "android-support-multidex-instrumentation-version", // use srcs as dependencies, otherwise, this module won't be re-run diff --git a/library/Android.bp b/library/Android.bp index 6ba5804..44813a5 100644 --- a/library/Android.bp +++ b/library/Android.bp @@ -12,6 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "frameworks_multidex_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_multidex_license"], +} + genrule { name: "android-support-multidex-version", tools: [ |