commit | dbc297bfb51776ff35a069310f897e81170d2050 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Apr 21 20:01:09 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Apr 21 20:01:09 2021 +0000 |
tree | 78656a13d6c2b9592df3dd4cc9ae2ccfcda4c6ea | |
parent | 263c81db05718d2a7612ac6f5dd66d02b9a19acd [diff] | |
parent | 09fa39abc6a3db55127c0c98eb04de66c62f285f [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25 am: 33a6fdfc47 am: 09fa39abc6 Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212 Change-Id: I35d710b19888f0069e6948aa177e79b5862c92fd
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)