summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorHung-ying Tyan2017-07-28 06:09:33 -0500
committerHung-ying Tyan2017-08-09 21:48:17 -0500
commit7d81b4e08172037674f378ffb6f45ad694c01077 (patch)
treeb8ca1da8f9110d35f3fb37e55336ddfbfc347086 /trusty
parent42a2f5c992fa1eeb0ddde4b34ae87bfd2983489a (diff)
downloadplatform-system-core-7d81b4e08172037674f378ffb6f45ad694c01077.tar.gz
platform-system-core-7d81b4e08172037674f378ffb6f45ad694c01077.tar.xz
platform-system-core-7d81b4e08172037674f378ffb6f45ad694c01077.zip
Move trusty reference implementations to /vendor
Trusty implementations are provided by vendors. This patch moves the AOSP reference implementations to the vendor partition. Bug: 63085384 Test: build gordon_peak which adopts trusty as the TEE and confirm that libtrusty and gateway.trusty are moved to /vendor. Test: build marlin which does not adopt trusty as the TEE and confirm that this patch has no effect on the build result. Change-Id: I9a5440071386b929058207fdef560ed2d7223ba3
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, 5 insertions, 0 deletions
diff --git a/trusty/gatekeeper/Android.bp b/trusty/gatekeeper/Android.bp
index a9566a17e..011f4a1c6 100644
--- a/trusty/gatekeeper/Android.bp
+++ b/trusty/gatekeeper/Android.bp
@@ -22,6 +22,7 @@
22 22
23cc_library_shared { 23cc_library_shared {
24 name: "gatekeeper.trusty", 24 name: "gatekeeper.trusty",
25 vendor: true,
25 26
26 relative_install_path: "hw", 27 relative_install_path: "hw",
27 28
diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 6b9d72359..6dcfb208b 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -25,6 +25,7 @@
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,
28 srcs: [ 29 srcs: [
29 "trusty_keymaster_device.cpp", 30 "trusty_keymaster_device.cpp",
30 "trusty_keymaster_ipc.cpp", 31 "trusty_keymaster_ipc.cpp",
@@ -45,6 +46,7 @@ cc_binary {
45// keystore.trusty is the HAL used by keystore on Trusty devices. 46// keystore.trusty is the HAL used by keystore on Trusty devices.
46cc_library_shared { 47cc_library_shared {
47 name: "keystore.trusty", 48 name: "keystore.trusty",
49 vendor: true,
48 relative_install_path: "hw", 50 relative_install_path: "hw",
49 srcs: [ 51 srcs: [
50 "module.cpp", 52 "module.cpp",
diff --git a/trusty/libtrusty/Android.bp b/trusty/libtrusty/Android.bp
index f316da229..88d624048 100644
--- a/trusty/libtrusty/Android.bp
+++ b/trusty/libtrusty/Android.bp
@@ -18,6 +18,7 @@ subdirs = [
18 18
19cc_library { 19cc_library {
20 name: "libtrusty", 20 name: "libtrusty",
21 vendor: true,
21 22
22 srcs: ["trusty.c"], 23 srcs: ["trusty.c"],
23 export_include_dirs: ["include"], 24 export_include_dirs: ["include"],
diff --git a/trusty/storage/proxy/Android.bp b/trusty/storage/proxy/Android.bp
index eb34df014..4088696ce 100644
--- a/trusty/storage/proxy/Android.bp
+++ b/trusty/storage/proxy/Android.bp
@@ -16,6 +16,7 @@
16 16
17cc_binary { 17cc_binary {
18 name: "storageproxyd", 18 name: "storageproxyd",
19 vendor: true,
19 20
20 srcs: [ 21 srcs: [
21 "ipc.c", 22 "ipc.c",