summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorHung-ying Tyan2017-08-22 21:42:18 -0500
committerandroid-build-merger2017-08-22 21:42:18 -0500
commitf151c8efd2a9cf26682ed736c945a8217d9aa703 (patch)
tree3959aaf409101fda828bbdfcaa76c933bedd4b52 /trusty
parent6c827ffb4f784a7d82a50f454c1f938023c3c31d (diff)
parent9495196e20915ea030c2f0bddfb0d96dc3ef768d (diff)
downloadplatform-system-core-f151c8efd2a9cf26682ed736c945a8217d9aa703.tar.gz
platform-system-core-f151c8efd2a9cf26682ed736c945a8217d9aa703.tar.xz
platform-system-core-f151c8efd2a9cf26682ed736c945a8217d9aa703.zip
Merge "Move trusty reference implementations to /vendor" into oc-mr1-dev
am: 9495196e20 Change-Id: I8e21eb54387caa145eac24de9a4b1ec752e7193e
Diffstat (limited to 'trusty')
-rw-r--r--trusty/gatekeeper/Android.bp2
-rw-r--r--trusty/keymaster/Android.bp3
-rw-r--r--trusty/libtrusty/Android.bp1
-rw-r--r--trusty/libtrusty/tipc-test/Android.bp6
-rw-r--r--trusty/storage/interface/Android.bp1
-rw-r--r--trusty/storage/lib/Android.bp5
-rw-r--r--trusty/storage/proxy/Android.bp2
-rw-r--r--trusty/storage/proxy/proxy.c2
-rw-r--r--trusty/storage/tests/Android.bp3
9 files changed, 21 insertions, 4 deletions
diff --git a/trusty/gatekeeper/Android.bp b/trusty/gatekeeper/Android.bp
index a9566a17e..65b271a79 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
@@ -43,4 +44,5 @@ cc_library_shared {
43 "libcutils", 44 "libcutils",
44 "libtrusty", 45 "libtrusty",
45 ], 46 ],
47 header_libs: ["libhardware_headers"],
46} 48}
diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 6b9d72359..0820fa0ec 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",
@@ -65,4 +67,5 @@ cc_library_shared {
65 "liblog", 67 "liblog",
66 "libcutils", 68 "libcutils",
67 ], 69 ],
70 header_libs: ["libhardware_headers"],
68} 71}
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/libtrusty/tipc-test/Android.bp b/trusty/libtrusty/tipc-test/Android.bp
index cb00fe772..25a3cb05f 100644
--- a/trusty/libtrusty/tipc-test/Android.bp
+++ b/trusty/libtrusty/tipc-test/Android.bp
@@ -14,12 +14,14 @@
14 14
15cc_test { 15cc_test {
16 name: "tipc-test", 16 name: "tipc-test",
17 static_executable: true, 17 vendor: true,
18 18
19 srcs: ["tipc_test.c"], 19 srcs: ["tipc_test.c"],
20 static_libs: [ 20 static_libs: [
21 "libc",
22 "libtrusty", 21 "libtrusty",
22 ],
23 shared_libs: [
24 "libc",
23 "liblog", 25 "liblog",
24 ], 26 ],
25 gtest: false, 27 gtest: false,
diff --git a/trusty/storage/interface/Android.bp b/trusty/storage/interface/Android.bp
index a551c37aa..18b4a5f90 100644
--- a/trusty/storage/interface/Android.bp
+++ b/trusty/storage/interface/Android.bp
@@ -16,5 +16,6 @@
16 16
17cc_library_static { 17cc_library_static {
18 name: "libtrustystorageinterface", 18 name: "libtrustystorageinterface",
19 vendor: true,
19 export_include_dirs: ["include"], 20 export_include_dirs: ["include"],
20} 21}
diff --git a/trusty/storage/lib/Android.bp b/trusty/storage/lib/Android.bp
index 5eb3f0778..4e41674bd 100644
--- a/trusty/storage/lib/Android.bp
+++ b/trusty/storage/lib/Android.bp
@@ -16,16 +16,19 @@
16 16
17cc_library_static { 17cc_library_static {
18 name: "libtrustystorage", 18 name: "libtrustystorage",
19 vendor: true,
19 20
20 srcs: ["storage.c"], 21 srcs: ["storage.c"],
21 22
22 export_include_dirs: ["include"], 23 export_include_dirs: ["include"],
23 24
24 static_libs: [ 25 static_libs: [
25 "liblog",
26 "libtrusty", 26 "libtrusty",
27 "libtrustystorageinterface", 27 "libtrustystorageinterface",
28 ], 28 ],
29 shared_libs: [
30 "liblog",
31 ],
29 32
30 cflags: [ 33 cflags: [
31 "-fvisibility=hidden", 34 "-fvisibility=hidden",
diff --git a/trusty/storage/proxy/Android.bp b/trusty/storage/proxy/Android.bp
index eb34df014..da8542d5a 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",
@@ -25,6 +26,7 @@ cc_binary {
25 ], 26 ],
26 27
27 shared_libs: ["liblog"], 28 shared_libs: ["liblog"],
29 header_libs: ["libcutils_headers"],
28 30
29 static_libs: [ 31 static_libs: [
30 "libtrustystorageinterface", 32 "libtrustystorageinterface",
diff --git a/trusty/storage/proxy/proxy.c b/trusty/storage/proxy/proxy.c
index 27e58917f..41263e5df 100644
--- a/trusty/storage/proxy/proxy.c
+++ b/trusty/storage/proxy/proxy.c
@@ -24,7 +24,7 @@
24#include <sys/stat.h> 24#include <sys/stat.h>
25#include <unistd.h> 25#include <unistd.h>
26 26
27#include <private/android_filesystem_config.h> 27#include <cutils/android_filesystem_config.h>
28 28
29#include "ipc.h" 29#include "ipc.h"
30#include "log.h" 30#include "log.h"
diff --git a/trusty/storage/tests/Android.bp b/trusty/storage/tests/Android.bp
index 1e4fced8f..536c3ca7a 100644
--- a/trusty/storage/tests/Android.bp
+++ b/trusty/storage/tests/Android.bp
@@ -16,6 +16,7 @@
16 16
17cc_test { 17cc_test {
18 name: "secure-storage-unit-test", 18 name: "secure-storage-unit-test",
19 vendor: true,
19 20
20 cflags: [ 21 cflags: [
21 "-g", 22 "-g",
@@ -28,6 +29,8 @@ cc_test {
28 "libtrustystorageinterface", 29 "libtrustystorageinterface",
29 "libtrustystorage", 30 "libtrustystorage",
30 "libtrusty", 31 "libtrusty",
32 ],
33 shared_libs: [
31 "liblog", 34 "liblog",
32 ], 35 ],
33 36