diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 01:02:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 01:02:05 +0000 |
| commit | 29aa94d12528701b7008e241e6acc2e5d1d6a127 (patch) | |
| tree | bf969fbfd3244e103a8ac4993ea243e3a9cf17ac | |
| parent | bf1809986ae60824667f54ce4dcd1df868612578 (diff) | |
| parent | b8a96c8025e79e0564b8aea6e1627d3516bda705 (diff) | |
| download | idea-29aa94d12528701b7008e241e6acc2e5d1d6a127.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to tools/adt/idea" am: 7ff97853e8 am: 7fad978edc am: b8a96c8025HEADandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-platform-13.0.0_r1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16mastermaingki13-boot-releaseandroid13-platform-releaseandroid12L-devandroid12L-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-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/tools/adt/idea/+/1589112
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I702083d671dfd083feca718d73556a8fe3bb8391
| -rw-r--r-- | android/ultimate/get_modification_time/jni/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android/ultimate/get_modification_time/jni/Android.mk b/android/ultimate/get_modification_time/jni/Android.mk index d2083e43e43..27daa70f5f2 100644 --- a/android/ultimate/get_modification_time/jni/Android.mk +++ b/android/ultimate/get_modification_time/jni/Android.mk @@ -3,6 +3,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := get_modification_time +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_SRC_FILES := get_modification_time.c include $(BUILD_EXECUTABLE) |