summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorJanis Danisevskis2017-05-02 19:22:39 -0500
committerJanis Danisevskis2017-05-02 19:22:39 -0500
commit8a0f637d418f23a732382b8989dc14eaad68e372 (patch)
treed92a90c7cfe209dac9c2903bfc21f97260e1bdcc /trusty
parentc5bb8c74d1265d4bd8827e66f884c72e7e1d896b (diff)
downloadplatform-system-core-8a0f637d418f23a732382b8989dc14eaad68e372.tar.gz
platform-system-core-8a0f637d418f23a732382b8989dc14eaad68e372.tar.xz
platform-system-core-8a0f637d418f23a732382b8989dc14eaad68e372.zip
Revert "libkeymaster1 split"
This reverts commit c5bb8c74d1265d4bd8827e66f884c72e7e1d896b. Reason for revert: build breakage Change-Id: I892346eec4a4628da893b0cd4182c8f546beb60a
Diffstat (limited to 'trusty')
-rw-r--r--trusty/keymaster/Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/trusty/keymaster/Android.mk b/trusty/keymaster/Android.mk
index 47c17bda7..2d614aec6 100644
--- a/trusty/keymaster/Android.mk
+++ b/trusty/keymaster/Android.mk
@@ -37,8 +37,7 @@ LOCAL_SRC_FILES := \
37LOCAL_SHARED_LIBRARIES := \ 37LOCAL_SHARED_LIBRARIES := \
38 libcrypto \ 38 libcrypto \
39 libcutils \ 39 libcutils \
40 libkeymaster_portable \ 40 libkeymaster1 \
41 libkeymaster \
42 libtrusty \ 41 libtrusty \
43 libkeymaster_messages \ 42 libkeymaster_messages \
44 libsoftkeymasterdevice \ 43 libsoftkeymasterdevice \