diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-21 20:21:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-21 20:21:47 +0000 |
| commit | 839f66289ae3dea2e9b82218b8dd324635725b05 (patch) | |
| tree | 78656a13d6c2b9592df3dd4cc9ae2ccfcda4c6ea | |
| parent | 263c81db05718d2a7612ac6f5dd66d02b9a19acd (diff) | |
| parent | dbc297bfb51776ff35a069310f897e81170d2050 (diff) | |
| download | pdk-android12L-d2-s3-release.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 92a69d4f25 am: 33a6fdfc47 am: 09fa39abc6 am: dbc297bfb5android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1682212
Change-Id: I71766dc3359a4adb1937b97a6a599c97af8ec2aa
| -rw-r--r-- | apps/HelloPDK/Android.mk | 2 | ||||
| -rw-r--r-- | apps/TestingCamera/Android.mk | 2 | ||||
| -rw-r--r-- | apps/TestingCamera2/Android.mk | 2 |
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) |