| commit | b51a11f231343d7a93b1f4f366e4b1c8fd9f8302 | [log] [tgz] |
|---|---|---|
| author | Bob Badour <bbadour@google.com> | Fri Feb 05 23:18:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 05 23:18:56 2021 +0000 |
| tree | 95adc25ab3574e2b4fb37d4554ae327015cecc5a | |
| parent | cff58c399ed52de871c8c3f6a5e1d6a7fce3ea14 [diff] | |
| parent | d4eb26054d33e06e477f1c40fca764c8193e672c [diff] |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/keymaster" am: c432d8cdc4 am: 02a1a7c5ed am: d4eb26054d Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/keymaster/+/1576111 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib38a287306a65468ccc3c29e1357922389dddf86
diff --git a/Android.mk b/Android.mk index 217c528..ed0e05d 100644 --- a/Android.mk +++ b/Android.mk
@@ -12,6 +12,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := keystore.$(TARGET_BOARD_PLATFORM) +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw