diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-02-16 01:35:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 01:35:52 +0000 |
| commit | 55cf3f350c51459fd4bec490ab4dce70bec421e3 (patch) | |
| tree | bf969fbfd3244e103a8ac4993ea243e3a9cf17ac | |
| parent | bf1809986ae60824667f54ce4dcd1df868612578 (diff) | |
| parent | 29aa94d12528701b7008e241e6acc2e5d1d6a127 (diff) | |
| download | idea-55cf3f350c51459fd4bec490ab4dce70bec421e3.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to tools/adt/idea" am: 7ff97853e8 am: 7fad978edc am: b8a96c8025 am: 29aa94d125android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/tools/adt/idea/+/1589112
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2b977b6ddfc7bd95677e6123fefba027994b899f
| -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) |