summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorHung-ying Tyan2017-08-11 03:02:21 -0500
committerHung-ying Tyan2017-08-11 03:02:21 -0500
commit5505eb783b0fdf12fda9b3e0613a12af52bd80b2 (patch)
tree9b388a15eba8003319eaa056ddb7c8008b7d8977 /trusty
parent7d81b4e08172037674f378ffb6f45ad694c01077 (diff)
downloadplatform-system-core-5505eb783b0fdf12fda9b3e0613a12af52bd80b2.tar.gz
platform-system-core-5505eb783b0fdf12fda9b3e0613a12af52bd80b2.tar.xz
platform-system-core-5505eb783b0fdf12fda9b3e0613a12af52bd80b2.zip
Revert "Move trusty reference implementations to /vendor"
The CL is not complete and will cause build break when BOARD_VNDK_VERSION is set. This reverts commit 7d81b4e08172037674f378ffb6f45ad694c01077. Change-Id: If9632fb7ee8147c39f1ad0860ddc3bed62ba89db
Diffstat (limited to 'trusty')
-rw-r--r--trusty/gatekeeper/Android.bp1
-rw-r--r--trusty/keymaster/Android.bp2
-rw-r--r--trusty/libtrusty/Android.bp1
-rw-r--r--trusty/storage/proxy/Android.bp1
4 files changed, 0 insertions, 5 deletions
diff --git a/trusty/gatekeeper/Android.bp b/trusty/gatekeeper/Android.bp
index 011f4a1c6..a9566a17e 100644
--- a/trusty/gatekeeper/Android.bp
+++ b/trusty/gatekeeper/Android.bp
@@ -22,7 +22,6 @@
22 22
23cc_library_shared { 23cc_library_shared {
24 name: "gatekeeper.trusty", 24 name: "gatekeeper.trusty",
25 vendor: true,
26 25
27 relative_install_path: "hw", 26 relative_install_path: "hw",
28 27
diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 6dcfb208b..6b9d72359 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -25,7 +25,6 @@
25// and ECDSA keys. 25// and ECDSA keys.
26cc_binary { 26cc_binary {
27 name: "trusty_keymaster_tipc", 27 name: "trusty_keymaster_tipc",
28 vendor: true,
29 srcs: [ 28 srcs: [
30 "trusty_keymaster_device.cpp", 29 "trusty_keymaster_device.cpp",
31 "trusty_keymaster_ipc.cpp", 30 "trusty_keymaster_ipc.cpp",
@@ -46,7 +45,6 @@ cc_binary {
46// keystore.trusty is the HAL used by keystore on Trusty devices. 45// keystore.trusty is the HAL used by keystore on Trusty devices.
47cc_library_shared { 46cc_library_shared {
48 name: "keystore.trusty", 47 name: "keystore.trusty",
49 vendor: true,
50 relative_install_path: "hw", 48 relative_install_path: "hw",
51 srcs: [ 49 srcs: [
52 "module.cpp", 50 "module.cpp",
diff --git a/trusty/libtrusty/Android.bp b/trusty/libtrusty/Android.bp
index 88d624048..f316da229 100644
--- a/trusty/libtrusty/Android.bp
+++ b/trusty/libtrusty/Android.bp
@@ -18,7 +18,6 @@ subdirs = [
18 18
19cc_library { 19cc_library {
20 name: "libtrusty", 20 name: "libtrusty",
21 vendor: true,
22 21
23 srcs: ["trusty.c"], 22 srcs: ["trusty.c"],
24 export_include_dirs: ["include"], 23 export_include_dirs: ["include"],
diff --git a/trusty/storage/proxy/Android.bp b/trusty/storage/proxy/Android.bp
index 4088696ce..eb34df014 100644
--- a/trusty/storage/proxy/Android.bp
+++ b/trusty/storage/proxy/Android.bp
@@ -16,7 +16,6 @@
16 16
17cc_binary { 17cc_binary {
18 name: "storageproxyd", 18 name: "storageproxyd",
19 vendor: true,
20 19
21 srcs: [ 20 srcs: [
22 "ipc.c", 21 "ipc.c",