diff options
author | Bob Badour <bbadour@google.com> | 2021-04-21 14:42:18 -0700 |
---|---|---|
committer | Bob Badour <bbadour@google.com> | 2021-04-21 14:42:18 -0700 |
commit | 1cdaca9f843297fbe4a91255ce79d630b002dd2a (patch) | |
tree | 050def2a8f7b56afb1f6209ebca936cc08fba7ac /tools | |
parent | 19762316de39bf2fdc67f2f085c8c5f5b0942d62 (diff) |
[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk
core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk
packages/Android.bp
packages/SystemUI/tests/Android.mk
services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
tests/Camera2Tests/CameraToo/Android.mk
tests/Camera2Tests/CameraToo/tests/Android.mk
tests/Camera2Tests/SmartCamera/SimpleCamera/Android.mk
tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
tests/CanvasCompare/Android.mk
tests/FlickerTests/test-apps/Android.bp
tests/LockTaskTests/Android.mk
tests/SoundTriggerTests/Android.mk
tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk
tools/aapt2/integration-tests/NamespaceTest/App/Android.mk
tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk
tools/fonts/Android.bp
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Ic480b653df5da840f5e65b818af3de5c8417ab4a
Diffstat (limited to 'tools')
4 files changed, 19 insertions, 1 deletions
diff --git a/tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk b/tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk index 6bc2064c6e63..27b6068632f3 100644 --- a/tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk +++ b/tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk @@ -20,10 +20,13 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_AAPT_NAMESPACES := true LOCAL_PACKAGE_NAME := AaptTestMergeOnly_App +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE LOCAL_SDK_VERSION := current LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_MODULE_TAGS := tests LOCAL_STATIC_ANDROID_LIBRARIES := \ AaptTestMergeOnly_LeafLib \ AaptTestMergeOnly_LocalLib -include $(BUILD_PACKAGE)
\ No newline at end of file +include $(BUILD_PACKAGE) diff --git a/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk index 446237412370..98b74403a7ff 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk +++ b/tools/aapt2/integration-tests/NamespaceTest/App/Android.mk @@ -20,6 +20,9 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_AAPT_NAMESPACES := true LOCAL_PACKAGE_NAME := AaptTestNamespace_App +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE LOCAL_SDK_VERSION := current LOCAL_EXPORT_PACKAGE_RESOURCES := true LOCAL_MODULE_TAGS := tests diff --git a/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk b/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk index 83e2289430f7..30375728c9e0 100644 --- a/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk +++ b/tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk @@ -20,6 +20,9 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_AAPT_NAMESPACES := true LOCAL_PACKAGE_NAME := AaptTestNamespace_Split +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../NOTICE LOCAL_SDK_VERSION := current LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under,src) diff --git a/tools/fonts/Android.bp b/tools/fonts/Android.bp index 8ea114f1efc2..eeb9e3ceda1e 100644 --- a/tools/fonts/Android.bp +++ b/tools/fonts/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_base_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: ["frameworks_base_license"], +} + python_defaults { name: "fonts_python_defaults", version: { |