diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2017-08-11 08:02:21 +0000 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2017-08-11 08:02:21 +0000 |
| commit | 5505eb783b0fdf12fda9b3e0613a12af52bd80b2 (patch) | |
| tree | 9b388a15eba8003319eaa056ddb7c8008b7d8977 /trusty | |
| parent | 7d81b4e08172037674f378ffb6f45ad694c01077 (diff) | |
| download | system_core-5505eb783b0fdf12fda9b3e0613a12af52bd80b2.tar.gz system_core-5505eb783b0fdf12fda9b3e0613a12af52bd80b2.tar.bz2 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.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, 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 @@ 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 6dcfb208b..6b9d72359 100644 --- a/trusty/keymaster/Android.bp +++ b/trusty/keymaster/Android.bp @@ -25,7 +25,6 @@ // and ECDSA keys. cc_binary { name: "trusty_keymaster_tipc", - vendor: true, srcs: [ "trusty_keymaster_device.cpp", "trusty_keymaster_ipc.cpp", @@ -46,7 +45,6 @@ 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 88d624048..f316da229 100644 --- a/trusty/libtrusty/Android.bp +++ b/trusty/libtrusty/Android.bp @@ -18,7 +18,6 @@ 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 4088696ce..eb34df014 100644 --- a/trusty/storage/proxy/Android.bp +++ b/trusty/storage/proxy/Android.bp @@ -16,7 +16,6 @@ cc_binary { name: "storageproxyd", - vendor: true, srcs: [ "ipc.c", |