summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanis Danisevskis <jdanis@google.com>2017-05-04 14:04:00 -0700
committerJanis Danisevskis <jdanis@google.com>2017-05-04 14:16:04 -0700
commit5d50d7e6054b42a398c7903326a7fbcab05c5cb8 (patch)
tree5970dc2d355bdee5ec4a3277d38e26c20851745e
parent5cc0d5ee603e436643c4f23fab91a0514c2d462d (diff)
downloadsecurity-5d50d7e6054b42a398c7903326a7fbcab05c5cb8.tar.gz
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: I589e9c87c2120034d5709a0d7a141d724065d683
-rw-r--r--keystore/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/Android.mk b/keystore/Android.mk
index e854772c..cef637a9 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -58,7 +58,7 @@ LOCAL_SHARED_LIBRARIES := \
libsoftkeymasterdevice \
libkeymaster_messages \
libkeymaster_portable \
- libkeymaster \
+ libkeymaster_staging \
libhwbinder \
libhidlbase \
libhidltransport \