summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorJanis Danisevskis2017-05-04 15:56:16 -0500
committerJanis Danisevskis2017-05-04 16:15:30 -0500
commit8f7d80468e0fb90ce7803a202d56cd8a3d4635fc (patch)
tree17bb4a2cd76302aa999f6e4d381c8136d6e1297c /trusty
parent754ecb83ad53357335e4968cf44394911b07e128 (diff)
downloadplatform-system-core-8f7d80468e0fb90ce7803a202d56cd8a3d4635fc.tar.gz
platform-system-core-8f7d80468e0fb90ce7803a202d56cd8a3d4635fc.tar.xz
platform-system-core-8f7d80468e0fb90ce7803a202d56cd8a3d4635fc.zip
Rename libkeymaster to libkeymaster_staging
Fix a build breakage by renaming libkeymaster to libkeymaster_staging. fugu's vendor tree already had a libkeymaster.so which masked system/keymaster/libkeymaster. Bug: 37997750 Change-Id: Iead014db3f3d841f08c8072b0493ec9fd7a05055
Diffstat (limited to 'trusty')
-rw-r--r--trusty/keymaster/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/trusty/keymaster/Android.mk b/trusty/keymaster/Android.mk
index 47c17bda7..5d2f6424f 100644
--- a/trusty/keymaster/Android.mk
+++ b/trusty/keymaster/Android.mk
@@ -38,7 +38,7 @@ LOCAL_SHARED_LIBRARIES := \
38 libcrypto \ 38 libcrypto \
39 libcutils \ 39 libcutils \
40 libkeymaster_portable \ 40 libkeymaster_portable \
41 libkeymaster \ 41 libkeymaster_staging \
42 libtrusty \ 42 libtrusty \
43 libkeymaster_messages \ 43 libkeymaster_messages \
44 libsoftkeymasterdevice \ 44 libsoftkeymasterdevice \