aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-04-21 19:28:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-21 19:28:09 +0000
commit09fa39abc6a3db55127c0c98eb04de66c62f285f (patch)
tree78656a13d6c2b9592df3dd4cc9ae2ccfcda4c6ea
parent8a587df2d18bd39a54121ff77176735115cbe81c (diff)
parent33a6fdfc47e519e970ca46d4e01ec32b8b5f7287 (diff)
downloadpdk-09fa39abc6a3db55127c0c98eb04de66c62f285f.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25 am: 33a6fdfc47
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212 Change-Id: I96be8a2c0ee5b8b7a14d2647842b9c7ec641a802
-rw-r--r--apps/HelloPDK/Android.mk2
-rw-r--r--apps/TestingCamera/Android.mk2
-rw-r--r--apps/TestingCamera2/Android.mk2
3 files changed, 6 insertions, 0 deletions
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_MODULE_TAGS := optional
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_SRC_FILES := \
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_SRC_FILES := \
LOCAL_DEX_PREOPT := false
LOCAL_PACKAGE_NAME := TestingCamera2
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
include $(BUILD_PACKAGE)