summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorJanis Danisevskis2017-04-27 17:22:00 -0500
committerJae Shin2017-10-13 20:18:32 -0500
commit5c148f3f26e7df3c23cdce0e7242406fab500058 (patch)
tree10ba7b40016d7ad3399033a4eb7e2c35e4190e3e /trusty
parent5126ce99de8a8945587cc6d68b6475f21bb537cb (diff)
downloadplatform-system-core-5c148f3f26e7df3c23cdce0e7242406fab500058.tar.gz
platform-system-core-5c148f3f26e7df3c23cdce0e7242406fab500058.tar.xz
platform-system-core-5c148f3f26e7df3c23cdce0e7242406fab500058.zip
libkeymaster1 split
libkeymaster1 was split into libkeymaster_portable and libkeymaster_staging. Bug: 37467707 Test: mma -j Merged-In: Iead014db3f3d841f08c8072b0493ec9fd7a05055 Merged-In: I63869316451867d54bf34afb28ea232cc7eddbae Change-Id: Iacdcef8631b4903fef4a79d146a9f59e37f31c3f
Diffstat (limited to 'trusty')
-rw-r--r--trusty/keymaster/Android.bp3
1 files changed, 2 insertions, 1 deletions
diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 3b6867cf1..6b9d72359 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -33,7 +33,8 @@ cc_binary {
33 shared_libs: [ 33 shared_libs: [
34 "libcrypto", 34 "libcrypto",
35 "libcutils", 35 "libcutils",
36 "libkeymaster1", 36 "libkeymaster_portable",
37 "libkeymaster_staging",
37 "libtrusty", 38 "libtrusty",
38 "libkeymaster_messages", 39 "libkeymaster_messages",
39 "libsoftkeymasterdevice", 40 "libsoftkeymasterdevice",