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

Commit 5505eb78 authored by Hung-ying Tyan's avatar Hung-ying Tyan
Browse files

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 7d81b4e0.

Change-Id: If9632fb7ee8147c39f1ad0860ddc3bed62ba89db
parent 7d81b4e0

CleanSpec.mk

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

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/init.rc)
 
$(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

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




cc_library_shared {

cc_library_shared {

    name: "gatekeeper.trusty",

    name: "gatekeeper.trusty",

    vendor: true,





    relative_install_path: "hw",

    relative_install_path: "hw",

trusty/keymaster/Android.bp

+0 −2
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ 
// and ECDSA keys.

// and ECDSA keys.

cc_binary {

cc_binary {

    name: "trusty_keymaster_tipc",

    name: "trusty_keymaster_tipc",

    vendor: true,

    srcs: [

    srcs: [

        "trusty_keymaster_device.cpp",

        "trusty_keymaster_device.cpp",

        "trusty_keymaster_ipc.cpp",

        "trusty_keymaster_ipc.cpp",
@@ -46,7 +45,6 @@ cc_binary { 
// keystore.trusty is the HAL used by keystore on Trusty devices.

// keystore.trusty is the HAL used by keystore on Trusty devices.

cc_library_shared {

cc_library_shared {

    name: "keystore.trusty",

    name: "keystore.trusty",

    vendor: true,

    relative_install_path: "hw",

    relative_install_path: "hw",

    srcs: [

    srcs: [

        "module.cpp",

        "module.cpp",

trusty/libtrusty/Android.bp

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




cc_library {

cc_library {

    name: "libtrusty",

    name: "libtrusty",

    vendor: true,





    srcs: ["trusty.c"],

    srcs: ["trusty.c"],

    export_include_dirs: ["include"],

    export_include_dirs: ["include"],

trusty/storage/proxy/Android.bp

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




cc_binary {

cc_binary {

    name: "storageproxyd",

    name: "storageproxyd",

    vendor: true,





    srcs: [

    srcs: [

        "ipc.c",

        "ipc.c",