diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2017-07-28 19:09:33 +0800 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2017-08-10 10:48:17 +0800 |
| commit | 7d81b4e08172037674f378ffb6f45ad694c01077 (patch) | |
| tree | b8ca1da8f9110d35f3fb37e55336ddfbfc347086 /trusty | |
| parent | 42a2f5c992fa1eeb0ddde4b34ae87bfd2983489a (diff) | |
| download | system_core-7d81b4e08172037674f378ffb6f45ad694c01077.tar.gz system_core-7d81b4e08172037674f378ffb6f45ad694c01077.tar.bz2 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.bp | 1 | ||||
| -rw-r--r-- | trusty/keymaster/Android.bp | 2 | ||||
| -rw-r--r-- | trusty/libtrusty/Android.bp | 1 | ||||
| -rw-r--r-- | trusty/storage/proxy/Android.bp | 1 |
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 @@ cc_library_shared { name: "gatekeeper.trusty", + vendor: true, relative_install_path: "hw", 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 @@ // and ECDSA keys. cc_binary { name: "trusty_keymaster_tipc", + vendor: true, srcs: [ "trusty_keymaster_device.cpp", "trusty_keymaster_ipc.cpp", @@ -45,6 +46,7 @@ cc_binary { // keystore.trusty is the HAL used by keystore on Trusty devices. cc_library_shared { name: "keystore.trusty", + vendor: true, relative_install_path: "hw", srcs: [ "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 = [ cc_library { name: "libtrusty", + vendor: true, srcs: ["trusty.c"], 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 @@ cc_binary { name: "storageproxyd", + vendor: true, srcs: [ "ipc.c", |