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

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

Merge "Define vintf_fragments as modules" into main am: 0371b379 

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



Change-Id: I3f097b0d9fc856b273096ada0315a3b0d4e5805c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c549ffb 0371b379

boot/aidl/default/Android.bp

+11 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ cc_binary { 
    name: "android.hardware.boot-service.default_recovery",

    defaults: ["android.hardware.boot-service_common"],

    init_rc: ["android.hardware.boot-service.default_recovery.rc"],

    vintf_fragments: ["android.hardware.boot-service.default.xml"],

    vintf_fragment_modules: ["android.hardware.boot-service.default.xml.recovery"],

    recovery: true,



    shared_libs: [
@@ -77,11 +77,16 @@ prebuilt_etc { 
    installable: false,

}



prebuilt_etc {

vintf_fragment {

    name: "android.hardware.boot-service.default.xml.recovery",

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

    recovery: true,

}



vintf_fragment {

    name: "android.hardware.boot-service.default.xml",

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

    sub_dir: "vintf",

    installable: false,

    vendor: true,

}



apex {
@@ -98,6 +103,8 @@ apex { 
    ],

    prebuilts: [

        "android.hardware.boot-service.default.rc",

    ],

    vintf_fragment_modules: [

        "android.hardware.boot-service.default.xml",

    ],

}