diff options
author | Bob Badour <bbadour@google.com> | 2021-04-20 14:02:28 -0700 |
---|---|---|
committer | Bob Badour <bbadour@google.com> | 2021-04-21 20:55:12 +0000 |
commit | 268090cd09097a9a8e699011b434d025744a9eb9 (patch) | |
tree | 7cbfd210bc109c968776ca099ae885d1bda53bae /tools | |
parent | c66289ebd2142309f2feaf2906fa30c484f85e7e (diff) |
DO NOT MERGE 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
location/tests/Android.bp
packages/CarSystemUI/tests/Android.mk
packages/SystemUI/tests/Android.mk
packages/overlays/AccentColorAmethystOverlay/Android.mk
packages/overlays/AccentColorAquamarineOverlay/Android.mk
packages/overlays/AccentColorBlackOverlay/Android.mk
packages/overlays/AccentColorCarbonOverlay/Android.mk
packages/overlays/AccentColorCinnamonOverlay/Android.mk
packages/overlays/AccentColorGreenOverlay/Android.mk
packages/overlays/AccentColorOceanOverlay/Android.mk
packages/overlays/AccentColorOrchidOverlay/Android.mk
packages/overlays/AccentColorPaletteOverlay/Android.mk
packages/overlays/AccentColorPurpleOverlay/Android.mk
packages/overlays/AccentColorSandOverlay/Android.mk
packages/overlays/AccentColorSpaceOverlay/Android.mk
packages/overlays/AccentColorTangerineOverlay/Android.mk
packages/overlays/DisplayCutoutEmulationCornerOverlay/Android.mk
packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk
packages/overlays/DisplayCutoutEmulationHoleOverlay/Android.mk
packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk
packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk
packages/overlays/DisplayCutoutEmulationWaterfallOverlay/Android.mk
packages/overlays/DisplayCutoutEmulationWideOverlay/Android.mk
packages/overlays/FontNotoSerifSourceOverlay/Android.mk
packages/overlays/IconPackCircularAndroidOverlay/Android.mk
packages/overlays/IconPackCircularLauncherOverlay/Android.mk
packages/overlays/IconPackCircularSettingsOverlay/Android.mk
packages/overlays/IconPackCircularSystemUIOverlay/Android.mk
packages/overlays/IconPackCircularThemePickerOverlay/Android.mk
packages/overlays/IconPackFilledAndroidOverlay/Android.mk
packages/overlays/IconPackFilledLauncherOverlay/Android.mk
packages/overlays/IconPackFilledSettingsOverlay/Android.mk
packages/overlays/IconPackFilledSystemUIOverlay/Android.mk
packages/overlays/IconPackFilledThemePickerOverlay/Android.mk
packages/overlays/IconPackKaiAndroidOverlay/Android.mk
packages/overlays/IconPackKaiLauncherOverlay/Android.mk
packages/overlays/IconPackKaiSettingsOverlay/Android.mk
packages/overlays/IconPackKaiSystemUIOverlay/Android.mk
packages/overlays/IconPackKaiThemePickerOverlay/Android.mk
packages/overlays/IconPackRoundedAndroidOverlay/Android.mk
packages/overlays/IconPackRoundedLauncherOverlay/Android.mk
packages/overlays/IconPackRoundedSettingsOverlay/Android.mk
packages/overlays/IconPackRoundedSystemUIOverlay/Android.mk
packages/overlays/IconPackRoundedThemePickerOverlay/Android.mk
packages/overlays/IconPackSamAndroidOverlay/Android.mk
packages/overlays/IconPackSamLauncherOverlay/Android.mk
packages/overlays/IconPackSamSettingsOverlay/Android.mk
packages/overlays/IconPackSamSystemUIOverlay/Android.mk
packages/overlays/IconPackSamThemePickerOverlay/Android.mk
packages/overlays/IconPackVictorAndroidOverlay/Android.mk
packages/overlays/IconPackVictorLauncherOverlay/Android.mk
packages/overlays/IconPackVictorSettingsOverlay/Android.mk
packages/overlays/IconPackVictorSystemUIOverlay/Android.mk
packages/overlays/IconPackVictorThemePickerOverlay/Android.mk
packages/overlays/IconShapeHeartOverlay/Android.mk
packages/overlays/IconShapePebbleOverlay/Android.mk
packages/overlays/IconShapeRoundedRectOverlay/Android.mk
packages/overlays/IconShapeSquareOverlay/Android.mk
packages/overlays/IconShapeSquircleOverlay/Android.mk
packages/overlays/IconShapeTaperedRectOverlay/Android.mk
packages/overlays/IconShapeTeardropOverlay/Android.mk
packages/overlays/IconShapeVesselOverlay/Android.mk
packages/overlays/NavigationBarMode2ButtonOverlay/Android.mk
packages/overlays/NavigationBarMode3ButtonOverlay/Android.mk
packages/overlays/NavigationBarModeGesturalOverlay/Android.mk
packages/overlays/NavigationBarModeGesturalOverlayExtraWideBack/Android.mk
packages/overlays/NavigationBarModeGesturalOverlayNarrowBack/Android.mk
packages/overlays/NavigationBarModeGesturalOverlayWideBack/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: I90231075f135176668586b903f2c85ec350fd527
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 bf506613c0a1..14c4b2c3fb03 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: { |