]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android/platform-hardware-interfaces.git/commitdiff
projects / android / platform-hardware-interfaces.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 463b19d)
Rename libkeymaster to libkeymaster_staging
authorJanis Danisevskis <jdanis@google.com>
Thu, 4 May 2017 21:05:06 +0000 (14:05 -0700)
committerJanis Danisevskis <jdanis@google.com>
Thu, 4 May 2017 21:16:20 +0000 (14:16 -0700)
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 patch | blob | history

diff --git a/keymaster/3.0/default/Android.mk b/keymaster/3.0/default/Android.mk
index 2dbb2000ac89481e4e6b16ad400de0be88259118..87ad2450c1c072a39ebaf74b4b959964d8eb811d 100644 (file)
--- 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 \
Stable Android distribution for TI processors; Supported SoCs: Jacinto (DRA7xx, J721E), Sitara (AM43xx, AM57xx, AM65x) - fork of https://android.googlesource.com/platform/hardware/interfaces/.