From 8a3cd3ba6cc34eea1d65446a0ba73e636d85ebd1 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Fri, 12 Feb 2021 18:10:01 -0800 Subject: [LSC] Add LOCAL_LICENSE_KINDS to frameworks/multidex Added SPDX-license-identifier-Apache-2.0 to: Android.bp instrumentation/Android.bp library/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Icaa12117d0cc1d1ce61637a5cff61096677c02da --- Android.bp | 31 +++++++++++++++++++++++++++++++ instrumentation/Android.bp | 9 +++++++++ library/Android.bp | 9 +++++++++ 3 files changed, 49 insertions(+) create mode 100644 Android.bp 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: [ -- cgit v1.2.3