Merge "Remove dependencies on the 1-variant fallback" into main (a0c2437e) · Commits · e / os / android_hardware_interfaces

health/utils/libhealthloop/Android.bp

+11 −3

Original line number	Diff line number	Diff line
		@@ -21,6 +21,12 @@ package {
		default_applicable_licenses: ["hardware_interfaces_license"],
		}

		bpf {
		name: "filterPowerSupplyEvents.o_non_vendor",
		srcs: ["filterPowerSupplyEvents.c"],
		visibility: ["//visibility:private"],
		}

		bpf {
		name: "filterPowerSupplyEvents.o",
		srcs: ["filterPowerSupplyEvents.c"],
		@@ -55,10 +61,10 @@ cc_library_static {
		],
		}

		genrule {
		cc_genrule {
		name: "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)",
		}

		@@ -76,8 +82,10 @@ cc_test_host {
		"libgmock",
		],
		generated_headers: [
		"filterPowerSupplyEvents.h",
		"libbpf_headers",
		],
		device_first_generated_headers: [
		"filterPowerSupplyEvents.h",
		],
		compile_multilib: "64",
		}

+1 −1

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

+1 −1

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

+1 −1

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