Merge "Remove dependencies on the 1-variant fallback" into main

This commit is contained in:
Treehugger Robot
2024-10-23 01:14:39 +00:00
committed by Gerrit Code Review
4 changed files with 14 additions and 6 deletions

View File

@@ -21,6 +21,12 @@ package {
default_applicable_licenses: ["hardware_interfaces_license"], default_applicable_licenses: ["hardware_interfaces_license"],
} }
bpf {
name: "filterPowerSupplyEvents.o_non_vendor",
srcs: ["filterPowerSupplyEvents.c"],
visibility: ["//visibility:private"],
}
bpf { bpf {
name: "filterPowerSupplyEvents.o", name: "filterPowerSupplyEvents.o",
srcs: ["filterPowerSupplyEvents.c"], srcs: ["filterPowerSupplyEvents.c"],
@@ -55,10 +61,10 @@ cc_library_static {
], ],
} }
genrule { cc_genrule {
name: "filterPowerSupplyEvents.h", name: "filterPowerSupplyEvents.h",
out: ["filterPowerSupplyEvents.h"], out: ["filterPowerSupplyEvents.h"],
srcs: [":filterPowerSupplyEvents.o"], srcs: [":filterPowerSupplyEvents.o_non_vendor"],
cmd: "cat $(in) | od -v -tx1 | cut -c9- | grep -v '^$$' | sed 's/^/0x/;s/ /, 0x/g;s/^, //;s/$$/,/' > $(out)", cmd: "cat $(in) | od -v -tx1 | cut -c9- | grep -v '^$$' | sed 's/^/0x/;s/ /, 0x/g;s/^, //;s/$$/,/' > $(out)",
} }
@@ -76,8 +82,10 @@ cc_test_host {
"libgmock", "libgmock",
], ],
generated_headers: [ generated_headers: [
"filterPowerSupplyEvents.h",
"libbpf_headers", "libbpf_headers",
], ],
device_first_generated_headers: [
"filterPowerSupplyEvents.h",
],
compile_multilib: "64", compile_multilib: "64",
} }

View File

@@ -26,7 +26,7 @@ cc_binary {
defaults: ["android.hardware.power-ndk_shared"], defaults: ["android.hardware.power-ndk_shared"],
relative_install_path: "hw", relative_install_path: "hw",
init_rc: [":android.hardware.power.rc"], init_rc: [":android.hardware.power.rc"],
vintf_fragments: [":android.hardware.power.xml"], vintf_fragments: ["power-default.xml"],
vendor: true, vendor: true,
shared_libs: [ shared_libs: [
"android.hardware.common-V2-ndk", "android.hardware.common-V2-ndk",

View File

@@ -25,7 +25,7 @@ cc_binary {
name: "android.hardware.power.stats-service.example", name: "android.hardware.power.stats-service.example",
relative_install_path: "hw", relative_install_path: "hw",
init_rc: [":android.hardware.power.stats.rc"], init_rc: [":android.hardware.power.stats.rc"],
vintf_fragments: [":android.hardware.power.stats.xml"], vintf_fragments: ["power.stats-default.xml"],
vendor: true, vendor: true,
shared_libs: [ shared_libs: [
"libbase", "libbase",

View File

@@ -44,7 +44,7 @@ cc_binary {
name: "android.hardware.vibrator-service.example", name: "android.hardware.vibrator-service.example",
relative_install_path: "hw", relative_install_path: "hw",
init_rc: ["vibrator-default.rc"], init_rc: ["vibrator-default.rc"],
vintf_fragments: [":android.hardware.vibrator.xml"], vintf_fragments: ["android.hardware.vibrator.xml"],
vendor: true, vendor: true,
shared_libs: [ shared_libs: [
"libbase", "libbase",