From 8cd5614c12a09996ab4809411647d08243c375aa Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Thu, 4 May 2017 14:05:06 -0700 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk index 2dbb2000ac..87ad2450c1 100644 --- a/keymaster/3.0/default/Android.mk +++ b/keymaster/3.0/default/Android.mk @@ -12,7 +12,7 @@ LOCAL_SHARED_LIBRARIES := \ libsoftkeymasterdevice \ libcrypto \ libkeymaster_portable \ - libkeymaster \ + libkeymaster_staging \ libhidlbase \ libhidltransport \ libutils \