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

Commit cadd26db authored by Jooyung Han's avatar Jooyung Han
Browse files

Cleanup: move VINTF fragments into VAPEX 

VINTF fragments for Power VAPEX were installed in /vendor/etc as a
workaround when VINTF fragments in VAPEX were not supported.

Bug: n/a
Test: m && launch_cvd
      # power/power-stat services are running
Change-Id: I0243a0bd2f2dd597260f73a3994cf81db213daf7
parent a0b0a624

power/aidl/default/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -39,9 +39,11 @@ cc_binary { 
    ],

}



filegroup {

prebuilt_etc {

    name: "android.hardware.power.xml",

    srcs: ["power-default.xml"],

    src: "power-default.xml",

    sub_dir: "vintf",

    installable: false,

}



filegroup {

power/aidl/default/apex/Android.bp

+5 −8
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ genrule { 
        ":android.hardware.power.stats.rc",

    ],

    out: ["com.android.hardware.power.rc"],

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

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

}



prebuilt_etc {
@@ -38,10 +38,9 @@ apex { 
    key: "com.android.hardware.key",

    certificate: ":com.android.hardware.certificate",

    file_contexts: "file_contexts",

    use_vndk_as_stable: true,

    updatable: false,

    // Install the apex in /vendor/apex

    soc_specific: true,

    vendor: true,



    // Bundle the Power and PowerStats HALs into this one APEX.

    binaries: [

        "android.hardware.power-service.example",
@@ -49,10 +48,8 @@ apex { 
    ],

    prebuilts: [

        "com.android.hardware.power.rc",

    ],

    vintf_fragments: [

        ":android.hardware.power.xml",

        ":android.hardware.power.stats.xml",

        "android.hardware.power.xml",

        "android.hardware.power.stats.xml",

    ],

    overrides: [

        // Shared lib installed by default but unused by the AIDL implementation.

power/aidl/default/apex/file_contexts

+1 −0
Original line number Diff line number Diff line 
(/.*)?                                                      u:object_r:vendor_file:s0

/etc(/.*)?                                                  u:object_r:vendor_configs_file:s0

/bin/hw/android\.hardware\.power-service\.example           u:object_r:hal_power_default_exec:s0

/bin/hw/android\.hardware\.power\.stats-service\.example    u:object_r:hal_power_stats_default_exec:s0

power/stats/aidl/default/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -38,9 +38,11 @@ cc_binary { 
    ],

}



filegroup {

prebuilt_etc {

    name: "android.hardware.power.stats.xml",

    srcs: ["power.stats-default.xml"],

    src: "power.stats-default.xml",

    sub_dir: "vintf",

    installable: false,

}



filegroup {