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

Commit caf85300 authored by Karuna Wadhera's avatar Karuna Wadhera
Browse files

Always use V4 FEATURE_HARDWARE_KEYSTORE XML file 

This is possible because the interfaces have been frozen.

Bug: 380020528
Bug: 369375199
Test: Treehugger
Change-Id: I3b64710b29a2c0d4462fd735d412587e26a31aeb
parent cf2c32da

trusty/keymaster/Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -120,10 +120,9 @@ cc_binary { 
        "libtrusty",

        "libutils",

    ],

    required: select(release_flag("RELEASE_AIDL_USE_UNFROZEN"), {

        true: ["android.hardware.hardware_keystore.xml"],

        default: ["android.hardware.hardware_keystore_V3.xml"],

    }),

    required: [

        "android.hardware.hardware_keystore.xml",

    ],

}



prebuilt_etc {

trusty/keymint/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -42,10 +42,7 @@ rust_binary { 
    defaults: ["android.hardware.security.keymint-service.rust.trusty.default"],

    init_rc: ["android.hardware.security.keymint-service.rust.trusty.rc"],

    vintf_fragments: ["android.hardware.security.keymint-service.rust.trusty.xml"],

    required: select(release_flag("RELEASE_AIDL_USE_UNFROZEN"), {

        true: ["android.hardware.hardware_keystore.xml"],

        default: ["android.hardware.hardware_keystore_V3.xml"],

    }),

    required: ["android.hardware.hardware_keystore.xml"],

}



rust_binary {