diff --git a/apps/Development/Android.mk b/apps/Development/Android.mk index f414eb886..39498d543 100644 --- a/apps/Development/Android.mk +++ b/apps/Development/Android.mk @@ -9,6 +9,9 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \ src/com/android/development/IRemoteService.aidl \ LOCAL_PACKAGE_NAME := Development +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform diff --git a/apps/DumpViewer/app/src/main/Android.mk b/apps/DumpViewer/app/src/main/Android.mk index c38fe9381..92c0c296e 100644 --- a/apps/DumpViewer/app/src/main/Android.mk +++ b/apps/DumpViewer/app/src/main/Android.mk @@ -25,6 +25,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ androidx.recyclerview_recyclerview LOCAL_PACKAGE_NAME := DumpViewer +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := 26 include $(BUILD_PACKAGE) diff --git a/samples/ApiDemos/Android.mk b/samples/ApiDemos/Android.mk index e25abef3a..9bc1ba044 100644 --- a/samples/ApiDemos/Android.mk +++ b/samples/ApiDemos/Android.mk @@ -16,6 +16,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \ LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := ApiDemos +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current diff --git a/samples/ApiDemos/tests/Android.mk b/samples/ApiDemos/tests/Android.mk index b2a94037b..ed37fbe83 100644 --- a/samples/ApiDemos/tests/Android.mk +++ b/samples/ApiDemos/tests/Android.mk @@ -16,10 +16,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) # automatically get all of its classes loaded into our environment. LOCAL_PACKAGE_NAME := ApiDemosTests +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_INSTRUMENTATION_FOR := ApiDemos LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE) - diff --git a/samples/IntentPlayground/Android.mk b/samples/IntentPlayground/Android.mk index d4f9dfbcb..10a7bda10 100644 --- a/samples/IntentPlayground/Android.mk +++ b/samples/IntentPlayground/Android.mk @@ -18,6 +18,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := IntentPlayground +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current diff --git a/samples/MultiClientInputMethod/Android.mk b/samples/MultiClientInputMethod/Android.mk index 7a16e09c0..d5b0abdf1 100755 --- a/samples/MultiClientInputMethod/Android.mk +++ b/samples/MultiClientInputMethod/Android.mk @@ -22,6 +22,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_PACKAGE_NAME := MultiClientInputMethod +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_CERTIFICATE := platform diff --git a/samples/MultiDisplay/Android.mk b/samples/MultiDisplay/Android.mk index 5b78b7119..6593dcf00 100644 --- a/samples/MultiDisplay/Android.mk +++ b/samples/MultiDisplay/Android.mk @@ -28,6 +28,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \ androidx.lifecycle_lifecycle-viewmodel LOCAL_PACKAGE_NAME := MultiDisplay +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current diff --git a/samples/RenderScript/HelloCompute/Android.mk b/samples/RenderScript/HelloCompute/Android.mk index 27798c463..cc5281c8c 100644 --- a/samples/RenderScript/HelloCompute/Android.mk +++ b/samples/RenderScript/HelloCompute/Android.mk @@ -23,6 +23,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ $(call all-renderscript-files-under, src) LOCAL_PACKAGE_NAME := RsHelloCompute +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := 14 include $(BUILD_PACKAGE) diff --git a/samples/RenderScript/Levels/Android.mk b/samples/RenderScript/Levels/Android.mk index ab02ecb31..99ebe1b94 100644 --- a/samples/RenderScript/Levels/Android.mk +++ b/samples/RenderScript/Levels/Android.mk @@ -22,6 +22,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) LOCAL_PACKAGE_NAME := LevelsRS +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE) diff --git a/samples/ShortcutDemo/launcher/Android.mk b/samples/ShortcutDemo/launcher/Android.mk index a59f1877e..b5325f503 100644 --- a/samples/ShortcutDemo/launcher/Android.mk +++ b/samples/ShortcutDemo/launcher/Android.mk @@ -22,6 +22,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := ShortcutLauncherDemo +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_TAGS := samples tests @@ -48,6 +50,8 @@ include $(BUILD_PACKAGE) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := ShortcutLauncherDemo2 +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_TAGS := samples tests diff --git a/samples/ShortcutDemo/publisher/Android.mk b/samples/ShortcutDemo/publisher/Android.mk index e6f16e759..bb633b09c 100644 --- a/samples/ShortcutDemo/publisher/Android.mk +++ b/samples/ShortcutDemo/publisher/Android.mk @@ -22,6 +22,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := ShortcutDemo +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_USE_AAPT2 := true @@ -46,6 +48,8 @@ include $(BUILD_PACKAGE) include $(CLEAR_VARS) LOCAL_PACKAGE_NAME := ShortcutDemo2 +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_USE_AAPT2 := true diff --git a/samples/ShortcutSample/Android.mk b/samples/ShortcutSample/Android.mk index 71a94c1c3..5463e6915 100644 --- a/samples/ShortcutSample/Android.mk +++ b/samples/ShortcutSample/Android.mk @@ -27,6 +27,8 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := ShortcutSample +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_AAPT_FLAGS += --version-code 10 @@ -51,6 +53,8 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := ShortcutSample11 +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_AAPT_FLAGS += --version-code 11 @@ -75,6 +79,8 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := ShortcutSample12 +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_AAPT_FLAGS += --version-code 12 @@ -99,6 +105,8 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := ShortcutSample11nb +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_AAPT_FLAGS += --version-code 11 LOCAL_MANIFEST_FILE := noback/AndroidManifest.xml @@ -124,6 +132,8 @@ include $(CLEAR_VARS) LOCAL_USE_AAPT2 := true LOCAL_PACKAGE_NAME := ShortcutSample12nb +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_AAPT_FLAGS += --version-code 12 LOCAL_MANIFEST_FILE := noback/AndroidManifest.xml @@ -139,4 +149,3 @@ LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4 LOCAL_SDK_VERSION := current include $(BUILD_PACKAGE) - diff --git a/testrunner/tests/Android_java.mk b/testrunner/tests/Android_java.mk index ff9138a53..2d6ac8836 100644 --- a/testrunner/tests/Android_java.mk +++ b/testrunner/tests/Android_java.mk @@ -20,6 +20,8 @@ LOCAL_JAVA_LIBRARIES := foo android.test.runner # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := ApiDemosTests +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_INSTRUMENTATION_FOR := ApiDemos LOCAL_SDK_VERSION := current