| commit | 33a6fdfc47e519e970ca46d4e01ec32b8b5f7287 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 21 19:01:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 19:01:42 2021 +0000 |
| tree | 78656a13d6c2b9592df3dd4cc9ae2ccfcda4c6ea | |
| parent | e70e1f5627832b8725b319b52ed60c26f7f64d41 [diff] | |
| parent | 92a69d4f25e91e500da8db07f42a78cc7eb969f1 [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212 Change-Id: I41c73f2ecb12d20fef2484d03efd3ce33743e732
diff --git a/apps/HelloPDK/Android.mk b/apps/HelloPDK/Android.mk index 1174bd2..9efe8ca 100644 --- a/apps/HelloPDK/Android.mk +++ b/apps/HelloPDK/Android.mk
@@ -25,6 +25,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := HelloPDK +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libhellojni_jni
diff --git a/apps/TestingCamera/Android.mk b/apps/TestingCamera/Android.mk index 80a51b4..6f48e02 100644 --- a/apps/TestingCamera/Android.mk +++ b/apps/TestingCamera/Android.mk
@@ -31,6 +31,8 @@ LOCAL_DEX_PREOPT := false LOCAL_PACKAGE_NAME := TestingCamera +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice include $(BUILD_PACKAGE)
diff --git a/apps/TestingCamera2/Android.mk b/apps/TestingCamera2/Android.mk index a9428a4..57f1790 100644 --- a/apps/TestingCamera2/Android.mk +++ b/apps/TestingCamera2/Android.mk
@@ -32,6 +32,8 @@ LOCAL_DEX_PREOPT := false LOCAL_PACKAGE_NAME := TestingCamera2 +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice include $(BUILD_PACKAGE)