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

Commit cb385138 authored by Jihoon Kang's avatar Jihoon Kang
Browse files

Define vintf_fragments as modules 

Define vintf_fragments as modules if the file is shared among multiple
modules to avoid any conflicts.

Note that additional vintf_fragment module is defined for the purpose
of installation in recovery partition. Setting `stem` property is not
needed as vintf_fragment module installs file based on the source file
name, not the module name.

Test: unpack and diff soong and make generated recovery partitions
Bug: 322089980
Bug: 381888358
Change-Id: If269790539fb7461c37df240c7c0e002e18c83ca
parent cdf74e0c

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

    ],

}