Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d81b4e0 authored by Hung-ying Tyan's avatar Hung-ying Tyan
Browse files

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
parent 42a2f5c9

CleanSpec.mk

+8 −0
Original line number Diff line number Diff line
@@ -60,3 +60,11 @@ $(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/storageproxyd.so)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/trusty_keymaster_tipc.so)

trusty/gatekeeper/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


cc_library_shared {

    name: "gatekeeper.trusty",

    vendor: true,



    relative_install_path: "hw",

trusty/keymaster/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -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",

trusty/libtrusty/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ subdirs = [ 


cc_library {

    name: "libtrusty",

    vendor: true,



    srcs: ["trusty.c"],

    export_include_dirs: ["include"],

trusty/storage/proxy/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


cc_binary {

    name: "storageproxyd",

    vendor: true,



    srcs: [

        "ipc.c",