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

Commit 9495196e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move trusty reference implementations to /vendor" into oc-mr1-dev

parents 24c29f1b 063a3fa4

CleanSpec.mk

+10 −0
Original line number Original line Diff line number Diff line
@@ -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)/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/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)

trusty/gatekeeper/Android.bp

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




cc_library_shared {

cc_library_shared {

    name: "gatekeeper.trusty",

    name: "gatekeeper.trusty",

    vendor: true,





    relative_install_path: "hw",

    relative_install_path: "hw",
@@ -43,4 +44,5 @@ cc_library_shared { 
        "libcutils",

        "libcutils",

        "libtrusty",

        "libtrusty",

    ],

    ],

    header_libs: ["libhardware_headers"],

}
 
}

trusty/keymaster/Android.bp

+3 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
// 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",
@@ -45,6 +46,7 @@ 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",
@@ -65,4 +67,5 @@ cc_library_shared { 
        "liblog",

        "liblog",

        "libcutils",

        "libcutils",

    ],

    ],

    header_libs: ["libhardware_headers"],

}
 
}

trusty/libtrusty/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 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/libtrusty/tipc-test/Android.bp

+4 −2
Original line number Original line Diff line number Diff line
@@ -14,12 +14,14 @@ 




cc_test {

cc_test {

    name: "tipc-test",

    name: "tipc-test",

    static_executable: true,

    vendor: true,





    srcs: ["tipc_test.c"],

    srcs: ["tipc_test.c"],

    static_libs: [

    static_libs: [

        "libc",

        "libtrusty",

        "libtrusty",

    ],

    shared_libs: [

        "libc",

        "liblog",

        "liblog",

    ],

    ],

    gtest: false,

    gtest: false,