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

Commit 36e1e6cc authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Install VINTF fragments over module 

Previously VINTF fragments in keymint / wifi APEX was installed with
prebuilt_etc module. However, as vintf_fragment module is being used
within the APEX, this prebuilt_etc module is no longer required. This
change removes a prebuilt_etc module which installed VINTF fragments in
the keymint / wifi APEX.

Bug: 363105686
Test: AOSP CF x86_64 build succeeded
Change-Id: I76af1485ae0aa00b051eec16bfc1daf1c9b8a0ea
Merged-In: I76af1485ae0aa00b051eec16bfc1daf1c9b8a0ea
parent 63b0ff50

security/keymint/aidl/default/Android.bp

+0 −12
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ apex { 
    ],

    prebuilts: [

        "keymint_aidl_nonsecure_init_rc",

        "keymint_aidl_nonsecure_vintf",

        "android.hardware.hardware_keystore.xml", // permissions

    ],

}
@@ -210,14 +209,3 @@ genrule { 
    out: ["android.hardware.security.keymint-service.nonsecure.apex.rc"],

    cmd: "sed -E 's%/vendor/bin/%/apex/com.android.hardware.keymint/bin/%' $(in) > $(out)",

}
 


prebuilt_etc {

    name: "keymint_aidl_nonsecure_vintf",

    sub_dir: "vintf",

    vendor: true,

    srcs: [

        "android.hardware.security.keymint-service.xml",

        "android.hardware.security.sharedsecret-service.xml",

        "android.hardware.security.secureclock-service.xml",

    ],

}

wifi/apex/Android.bp

+0 −8
Original line number Diff line number Diff line
@@ -15,13 +15,6 @@ prebuilt_etc { 
    installable: false,

}



prebuilt_etc {

    name: "com.android.hardware.wifi.xml",

    src: ":default-android.hardware.wifi-service.xml",

    installable: false,

    sub_dir: "vintf",

}



apex {

    name: "com.android.hardware.wifi",

    manifest: "apex_manifest.json",
@@ -36,7 +29,6 @@ apex { 
    ],

    prebuilts: [

        "com.android.hardware.wifi.rc",

        "com.android.hardware.wifi.xml",

    ],

    overrides: [

        "android.hardware.wifi-service",