LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[LSC] Add LOCAL_LICENSE_KINDS to development" am: e748063d28

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1682225

Change-Id: I53029b6fe7286287bf85a1e119bcd4ea889f0a58
This commit is contained in:
Treehugger Robot
2021-04-21 19:01:41 +00:00
committed by Automerger Merge Worker
parent a2c173be97 e748063d28
commit 347249060a
13 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/Development/Android.mk
View File

@@ -9,6 +9,9 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) \
src/com/android/development/IRemoteService.aidl \ src/com/android/development/IRemoteService.aidl \
LOCAL_PACKAGE_NAME := Development 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_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform

2
apps/DumpViewer/app/src/main/Android.mk
View File

@@ -25,6 +25,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
androidx.recyclerview_recyclerview androidx.recyclerview_recyclerview
LOCAL_PACKAGE_NAME := DumpViewer LOCAL_PACKAGE_NAME := DumpViewer
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := 26 LOCAL_SDK_VERSION := 26
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

2
samples/ApiDemos/Android.mk
View File

@@ -16,6 +16,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ApiDemos LOCAL_PACKAGE_NAME := ApiDemos
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current

3
samples/ApiDemos/tests/Android.mk
View File

@@ -16,10 +16,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
# automatically get all of its classes loaded into our environment. # automatically get all of its classes loaded into our environment.
LOCAL_PACKAGE_NAME := ApiDemosTests LOCAL_PACKAGE_NAME := ApiDemosTests
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_INSTRUMENTATION_FOR := ApiDemos LOCAL_INSTRUMENTATION_FOR := ApiDemos
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

2
samples/IntentPlayground/Android.mk
View File

@@ -18,6 +18,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := IntentPlayground LOCAL_PACKAGE_NAME := IntentPlayground
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current

2
samples/MultiClientInputMethod/Android.mk
View File

@@ -22,6 +22,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_PACKAGE_NAME := MultiClientInputMethod LOCAL_PACKAGE_NAME := MultiClientInputMethod
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_PRIVATE_PLATFORM_APIS := true LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := platform

2
samples/MultiDisplay/Android.mk
View File

@@ -28,6 +28,8 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \
androidx.lifecycle_lifecycle-viewmodel androidx.lifecycle_lifecycle-viewmodel
LOCAL_PACKAGE_NAME := MultiDisplay LOCAL_PACKAGE_NAME := MultiDisplay
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current

2
samples/RenderScript/HelloCompute/Android.mk
View File

@@ -23,6 +23,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-renderscript-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := RsHelloCompute LOCAL_PACKAGE_NAME := RsHelloCompute
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

2
samples/RenderScript/Levels/Android.mk
View File

@@ -22,6 +22,8 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_PACKAGE_NAME := LevelsRS LOCAL_PACKAGE_NAME := LevelsRS
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

4
samples/ShortcutDemo/launcher/Android.mk
View File

@@ -22,6 +22,8 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := ShortcutLauncherDemo LOCAL_PACKAGE_NAME := ShortcutLauncherDemo
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := samples tests LOCAL_MODULE_TAGS := samples tests
@@ -48,6 +50,8 @@ include $(BUILD_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := ShortcutLauncherDemo2 LOCAL_PACKAGE_NAME := ShortcutLauncherDemo2
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_MODULE_TAGS := samples tests LOCAL_MODULE_TAGS := samples tests

4
samples/ShortcutDemo/publisher/Android.mk
View File

@@ -22,6 +22,8 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := ShortcutDemo LOCAL_PACKAGE_NAME := ShortcutDemo
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
@@ -46,6 +48,8 @@ include $(BUILD_PACKAGE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := ShortcutDemo2 LOCAL_PACKAGE_NAME := ShortcutDemo2
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true

11
samples/ShortcutSample/Android.mk
View File

@@ -27,6 +27,8 @@ include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample LOCAL_PACKAGE_NAME := ShortcutSample
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_AAPT_FLAGS += --version-code 10 LOCAL_AAPT_FLAGS += --version-code 10
@@ -51,6 +53,8 @@ include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample11 LOCAL_PACKAGE_NAME := ShortcutSample11
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_AAPT_FLAGS += --version-code 11 LOCAL_AAPT_FLAGS += --version-code 11
@@ -75,6 +79,8 @@ include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample12 LOCAL_PACKAGE_NAME := ShortcutSample12
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_AAPT_FLAGS += --version-code 12 LOCAL_AAPT_FLAGS += --version-code 12
@@ -99,6 +105,8 @@ include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample11nb LOCAL_PACKAGE_NAME := ShortcutSample11nb
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_AAPT_FLAGS += --version-code 11 LOCAL_AAPT_FLAGS += --version-code 11
LOCAL_MANIFEST_FILE := noback/AndroidManifest.xml LOCAL_MANIFEST_FILE := noback/AndroidManifest.xml
@@ -124,6 +132,8 @@ include $(CLEAR_VARS)
LOCAL_USE_AAPT2 := true LOCAL_USE_AAPT2 := true
LOCAL_PACKAGE_NAME := ShortcutSample12nb LOCAL_PACKAGE_NAME := ShortcutSample12nb
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_AAPT_FLAGS += --version-code 12 LOCAL_AAPT_FLAGS += --version-code 12
LOCAL_MANIFEST_FILE := noback/AndroidManifest.xml LOCAL_MANIFEST_FILE := noback/AndroidManifest.xml
@@ -139,4 +149,3 @@ LOCAL_STATIC_ANDROID_LIBRARIES = androidx.legacy_legacy-support-v4
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)

2
testrunner/tests/Android_java.mk
View File

@@ -20,6 +20,8 @@ LOCAL_JAVA_LIBRARIES := foo android.test.runner
# Include all test java files. # Include all test java files.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := ApiDemosTests LOCAL_PACKAGE_NAME := ApiDemosTests
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice
LOCAL_INSTRUMENTATION_FOR := ApiDemos LOCAL_INSTRUMENTATION_FOR := ApiDemos
LOCAL_SDK_VERSION := current LOCAL_SDK_VERSION := current