diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 20:01:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:01:08 +0000 |
| commit | a56e185f529ede224a7269b0dfec36c5580caafb (patch) | |
| tree | 4bf18686364990151f51dc447d65ba40ddc75fdf | |
| parent | 71ebbc25cf02f3bbce3dbef68e2e93f491c6e5ef (diff) | |
| parent | 62dbe72820cfb3c8c3253d1adc6d29e6ca987b81 (diff) | |
| download | sample-a56e185f529ede224a7269b0dfec36c5580caafb.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to device/sample" am: 5b1d3be17c am: 4816f9f4f1 am: 62dbe72820
Original change: https://android-review.googlesource.com/c/device/sample/+/1682053
Change-Id: I7b3171db5e53579ec6eb41e81a9c769c9a1d2a71
| -rw-r--r-- | apps/SampleEmailPolicy/Android.mk | 2 | ||||
| -rw-r--r-- | apps/client/Android.mk | 2 | ||||
| -rw-r--r-- | apps/tv/LeanbackCustomizer/Android.mk | 2 | ||||
| -rw-r--r-- | apps/tv/LeanbackWidget/Android.mk | 2 | ||||
| -rw-r--r-- | apps/upgrade/Android.mk | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/apps/SampleEmailPolicy/Android.mk b/apps/SampleEmailPolicy/Android.mk index a8453c1..c775a04 100644 --- a/apps/SampleEmailPolicy/Android.mk +++ b/apps/SampleEmailPolicy/Android.mk @@ -28,6 +28,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := SampleEmailPolicy +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current LOCAL_CERTIFICATE := platform diff --git a/apps/client/Android.mk b/apps/client/Android.mk index dfb6357..c2c8ba5 100644 --- a/apps/client/Android.mk +++ b/apps/client/Android.mk @@ -26,6 +26,8 @@ LOCAL_MODULE_TAGS := optional # This is the target being built. LOCAL_PACKAGE_NAME := PlatformLibraryClient +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/apps/tv/LeanbackCustomizer/Android.mk b/apps/tv/LeanbackCustomizer/Android.mk index fb4f41c..54db7c3 100644 --- a/apps/tv/LeanbackCustomizer/Android.mk +++ b/apps/tv/LeanbackCustomizer/Android.mk @@ -7,6 +7,8 @@ LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/priv-app LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := LeanbackCustomizer +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current diff --git a/apps/tv/LeanbackWidget/Android.mk b/apps/tv/LeanbackWidget/Android.mk index 7209b52..1fe0dea 100644 --- a/apps/tv/LeanbackWidget/Android.mk +++ b/apps/tv/LeanbackWidget/Android.mk @@ -7,6 +7,8 @@ LOCAL_MODULE_PATH := $(PRODUCT_OUT)/system/app LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := LeanbackWidget +LOCAL_LICENSE_KINDS := legacy_notice +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current diff --git a/apps/upgrade/Android.mk b/apps/upgrade/Android.mk index 01ec440..e67fc16 100644 --- a/apps/upgrade/Android.mk +++ b/apps/upgrade/Android.mk @@ -23,6 +23,8 @@ LOCAL_MODULE_TAGS := optional # This is the target being built. LOCAL_PACKAGE_NAME := UpgradeExample +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) |