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.
Test: mmm BOARD_VNDK_VERSION=current system/core/trusty
Change-Id: I7f6d897b86c69d06923a18d28154760e006dd193
This commit is contained in:
Hung-ying Tyan 2017-07-28 19:09:33 +08:00
parent 202fedd1fe
commit 063a3fa4d2
10 changed files with 31 additions and 4 deletions

View file

@ -60,3 +60,13 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/gatekeeper.$(TARGET_D
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/gatekeeper.$(TARGET_DEVICE).so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/vendor)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.rc)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/libtrusty.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/libtrusty.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/keystore.trusty.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/keystore.trusty.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/gatekeeper.trusty.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/gatekeeper.trusty.so)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/secure-storage-unit-test)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/storageproxyd)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/tipc-test)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/trusty_keymaster_tipc)

View file

@ -22,6 +22,7 @@
cc_library_shared {
name: "gatekeeper.trusty",
vendor: true,
relative_install_path: "hw",
@ -43,4 +44,5 @@ cc_library_shared {
"libcutils",
"libtrusty",
],
header_libs: ["libhardware_headers"],
}

View file

@ -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",
@ -65,4 +67,5 @@ cc_library_shared {
"liblog",
"libcutils",
],
header_libs: ["libhardware_headers"],
}

View file

@ -18,6 +18,7 @@ subdirs = [
cc_library {
name: "libtrusty",
vendor: true,
srcs: ["trusty.c"],
export_include_dirs: ["include"],

View file

@ -14,12 +14,14 @@
cc_test {
name: "tipc-test",
static_executable: true,
vendor: true,
srcs: ["tipc_test.c"],
static_libs: [
"libc",
"libtrusty",
],
shared_libs: [
"libc",
"liblog",
],
gtest: false,

View file

@ -16,5 +16,6 @@
cc_library_static {
name: "libtrustystorageinterface",
vendor: true,
export_include_dirs: ["include"],
}

View file

@ -16,16 +16,19 @@
cc_library_static {
name: "libtrustystorage",
vendor: true,
srcs: ["storage.c"],
export_include_dirs: ["include"],
static_libs: [
"liblog",
"libtrusty",
"libtrustystorageinterface",
],
shared_libs: [
"liblog",
],
cflags: [
"-fvisibility=hidden",

View file

@ -16,6 +16,7 @@
cc_binary {
name: "storageproxyd",
vendor: true,
srcs: [
"ipc.c",
@ -25,6 +26,7 @@ cc_binary {
],
shared_libs: ["liblog"],
header_libs: ["libcutils_headers"],
static_libs: [
"libtrustystorageinterface",

View file

@ -24,7 +24,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <private/android_filesystem_config.h>
#include <cutils/android_filesystem_config.h>
#include "ipc.h"
#include "log.h"

View file

@ -16,6 +16,7 @@
cc_test {
name: "secure-storage-unit-test",
vendor: true,
cflags: [
"-g",
@ -29,6 +30,8 @@ cc_test {
"libtrustystorageinterface",
"libtrustystorage",
"libtrusty",
],
shared_libs: [
"liblog",
],