tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup: move VINTF fragments into VAPEX am: cadd26dbe7 am: 02de97ef48 am: bfd81c90d6 am: 9f3776cece

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

Change-Id: I1cccf8abb8a871cb897d3004ee2ecebf3e51545d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han 2023-10-10 09:51:43 +00:00 committed by Automerger Merge Worker
commit f286928491
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
power/aidl/default/Android.bp
View file

@ -39,9 +39,11 @@ cc_binary {
], ],
} }
filegroup { prebuilt_etc {
name: "android.hardware.power.xml", name: "android.hardware.power.xml",
srcs: ["power-default.xml"], src: "power-default.xml",
sub_dir: "vintf",
installable: false,
} }
filegroup { filegroup {

13
power/aidl/default/apex/Android.bp
View file

@ -23,7 +23,7 @@ genrule {
":android.hardware.power.stats.rc", ":android.hardware.power.stats.rc",
], ],
out: ["com.android.hardware.power.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 { prebuilt_etc {
@ -38,10 +38,9 @@ apex {
key: "com.android.hardware.key", key: "com.android.hardware.key",
certificate: ":com.android.hardware.certificate", certificate: ":com.android.hardware.certificate",
file_contexts: "file_contexts", file_contexts: "file_contexts",
use_vndk_as_stable: true,
updatable: false, updatable: false,
// Install the apex in /vendor/apex vendor: true,
soc_specific: true,
// Bundle the Power and PowerStats HALs into this one APEX. // Bundle the Power and PowerStats HALs into this one APEX.
binaries: [ binaries: [
"android.hardware.power-service.example", "android.hardware.power-service.example",
@ -49,10 +48,8 @@ apex {
], ],
prebuilts: [ prebuilts: [
"com.android.hardware.power.rc", "com.android.hardware.power.rc",
], "android.hardware.power.xml",
vintf_fragments: [ "android.hardware.power.stats.xml",
":android.hardware.power.xml",
":android.hardware.power.stats.xml",
], ],
overrides: [ overrides: [
// Shared lib installed by default but unused by the AIDL implementation. // Shared lib installed by default but unused by the AIDL implementation.

1
power/aidl/default/apex/file_contexts
View file

@ -1,3 +1,4 @@
(/.*)? u:object_r:vendor_file:s0 (/.*)? 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-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 /bin/hw/android\.hardware\.power\.stats-service\.example u:object_r:hal_power_stats_default_exec:s0

6
power/stats/aidl/default/Android.bp
View file

@ -38,9 +38,11 @@ cc_binary {
], ],
} }
filegroup { prebuilt_etc {
name: "android.hardware.power.stats.xml", name: "android.hardware.power.stats.xml",
srcs: ["power.stats-default.xml"], src: "power.stats-default.xml",
sub_dir: "vintf",
installable: false,
} }
filegroup { filegroup {