commit 71ebd5f6b439da81cf43138314814a7d8bd4854a
author Janis Danisevskis <jdanis@google.com> Thu May 04 14:05:06 2017 -0700
committer Janis Danisevskis <jdanis@google.com> Thu May 04 14:16:20 2017 -0700
tree ff9cf364f030a10365edd5ac899027846393aaea
parent 463b19db6584879c92905c21149af72bedd79a96

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: Ie478726bf81e965be64fb913844b881064e9b66c

keymaster/3.0/default/Android.mk

diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk
index 2dbb200..87ad245 100644
--- a/keymaster/3.0/default/Android.mk
+++ b/keymaster/3.0/default/Android.mk
@@ -12,7 +12,7 @@
     libsoftkeymasterdevice \
     libcrypto \
     libkeymaster_portable \
-    libkeymaster \
+    libkeymaster_staging \
     libhidlbase \
     libhidltransport \
     libutils \