diff options
author | Bob Badour <bbadour@google.com> | 2021-02-05 23:18:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-05 23:18:56 +0000 |
commit | b51a11f231343d7a93b1f4f366e4b1c8fd9f8302 (patch) | |
tree | 95adc25ab3574e2b4fb37d4554ae327015cecc5a | |
parent | cff58c399ed52de871c8c3f6a5e1d6a7fce3ea14 (diff) | |
parent | d4eb26054d33e06e477f1c40fca764c8193e672c (diff) | |
download | keymaster-b51a11f231343d7a93b1f4f366e4b1c8fd9f8302.tar.gz |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/keymaster" am: c432d8cdc4 am: 02a1a7c5ed am: d4eb26054dandroid-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-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_r16android12L-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-devandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/keymaster/+/1576111
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib38a287306a65468ccc3c29e1357922389dddf86
-rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -12,6 +12,8 @@ endif 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 |