summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2021-03-04 00:40:26 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2021-03-04 00:40:26 +0000
commit669907a57d7d14408cb2143dcfc9eaddb05e905b (patch)
tree49cfc4d8344e7015c625f74f9cf31d83d6283bec
parenta914cd880a01c406d600e9029488179cbb9bba72 (diff)
parent7da62b51cdb754782fe6e9a89f66c940359e6087 (diff)
downloadmultidex-669907a57d7d14408cb2143dcfc9eaddb05e905b.tar.gz
Snap for 7183507 from 7da62b51cdb754782fe6e9a89f66c940359e6087 to sdk-releaseplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1
Change-Id: I3878d33f51202ec15c65da2e6413a34772eea65d
-rw-r--r--Android.bp31
-rw-r--r--instrumentation/Android.bp9
-rw-r--r--library/Android.bp9
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: [