commit 8cd5614c12a09996ab4809411647d08243c375aa
author Janis Danisevskis <jdanis@google.com> Thu May 04 14:05:06 2017 -0700
committer Jae Shin <jaeshin@google.com> Mon Oct 16 00:51:19 2017 +0000
tree 5de4c20f713cb8a832dac55713edf08a3836c933
parent ab887a44335d1ab3ab0cdb4e9cb0d5a6f5166c39

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
Test: mma -j
Merged-In: Ie478726bf81e965be64fb913844b881064e9b66c
Change-Id: Ie478726bf81e965be64fb913844b881064e9b66c
(cherry picked from commit 71ebd5f6b439da81cf43138314814a7d8bd4854a)

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 \