diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-19 02:25:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-19 02:25:34 +0000 |
| commit | 9fe2daa54a5f02e91c9d1d481998738e52aef370 (patch) | |
| tree | 21cdbbaa00b9b6e1e12f186ab9adb39a3aaac885 | |
| parent | 9d36462bac161b08d37ce90a96261561e1902689 (diff) | |
| parent | 8e48312c88c49fa4ead66e4284f00b8324a72d37 (diff) | |
| download | pdk-9fe2daa54a5f02e91c9d1d481998738e52aef370.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to pdk" am: 6d08176be6 am: 8e48312c88
Original change: https://android-review.googlesource.com/c/platform/pdk/+/1588475
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibb3d8e96a3b04fb94fddf18f44ef663cb697b75a
| -rw-r--r-- | apps/HelloPDK/jni/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/HelloPDK/jni/Android.mk b/apps/HelloPDK/jni/Android.mk index eb0f219..8f8bb3d 100644 --- a/apps/HelloPDK/jni/Android.mk +++ b/apps/HelloPDK/jni/Android.mk @@ -21,6 +21,8 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := libhellojni_jni +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_TAGS := optional |