Rename libkeymaster to libkeymaster_staging
authorJanis Danisevskis <jdanis@google.com>
Thu, 4 May 2017 21:05:06 +0000 (14:05 -0700)
committerJae Shin <jaeshin@google.com>
Mon, 16 Oct 2017 00:51:19 +0000 (00:51 +0000)
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

index 2dbb2000ac89481e4e6b16ad400de0be88259118..87ad2450c1c072a39ebaf74b4b959964d8eb811d 100644 (file)
@@ -12,7 +12,7 @@ LOCAL_SHARED_LIBRARIES := \
     libsoftkeymasterdevice \
     libcrypto \
     libkeymaster_portable \
-    libkeymaster \
+    libkeymaster_staging \
     libhidlbase \
     libhidltransport \
     libutils \