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

Commit 2dea72b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Install VINTF fragments over module" into main am: 36418e41 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3428282



Change-Id: Ib6f075b29c6a8f14bdeebdfc4ba31c2abb898a66
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1693097 36418e41

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",