From 8f7d80468e0fb90ce7803a202d56cd8a3d4635fc Mon Sep 17 00:00:00 2001
From: Janis Danisevskis <jdanis@google.com>
Date: Thu, 4 May 2017 13:56:16 -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
Change-Id: Iead014db3f3d841f08c8072b0493ec9fd7a05055
---
 trusty/keymaster/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trusty/keymaster/Android.mk b/trusty/keymaster/Android.mk
index 47c17bda7..5d2f6424f 100644
--- a/trusty/keymaster/Android.mk
+++ b/trusty/keymaster/Android.mk
@@ -38,7 +38,7 @@ LOCAL_SHARED_LIBRARIES := \
 	libcrypto \
 	libcutils \
 	libkeymaster_portable \
-	libkeymaster \
+	libkeymaster_staging \
 	libtrusty \
 	libkeymaster_messages \
 	libsoftkeymasterdevice \