libinit_host: clean up dependencies
libinit_host doesn't need HIDL stuff. host_init_verifier does HIDL
interface checks.
Bug: 326827772
Test: mmma system/core
Change-Id: I59c1444649a62202abb54a2e0cceee38522c1259
diff --git a/init/Android.bp b/init/Android.bp
index 8f1ca3d..18a79d6 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -84,11 +84,6 @@
"ueventd.cpp",
"ueventd_parser.cpp",
]
-init_host_sources = [
- "check_builtins.cpp",
- "host_import_parser.cpp",
- "interface_utils.cpp",
-]
soong_config_module_type {
name: "libinit_cc_defaults",
@@ -606,8 +601,6 @@
whole_static_libs: ["libcap"],
shared_libs: [
"libcutils",
- "libhidl-gen-utils",
- "libhidlmetadata",
"liblog",
"libprocessgroup",
"libprotobuf-cpp-lite",
@@ -615,9 +608,6 @@
proto: {
type: "lite",
},
- generated_headers: [
- "generated_stub_builtin_function_map",
- ],
target: {
android: {
enabled: false,
@@ -636,17 +626,43 @@
cc_binary {
name: "host_init_verifier",
defaults: ["init_host_defaults"],
- srcs: ["host_init_verifier.cpp"] + init_common_sources + init_host_sources,
+ srcs: [
+ "check_builtins.cpp",
+ "host_import_parser.cpp",
+ "host_init_verifier.cpp",
+ "interface_utils.cpp",
+ ] + init_common_sources,
generated_headers: [
"generated_android_ids",
+ "generated_stub_builtin_function_map",
],
+ shared_libs: [
+ "libhidl-gen-utils",
+ "libhidlmetadata",
+ ],
+}
+
+genrule {
+ name: "noop_builtin_function_map",
+ tool_files: ["host_builtin_map.py"],
+ out: ["noop_builtin_function_map.h"],
+ srcs: [
+ "builtins.cpp",
+ "noop_builtins.cpp",
+ ],
+ cmd: "$(location host_builtin_map.py) --builtins $(location builtins.cpp) --check_builtins $(location noop_builtins.cpp) > $(out)",
}
cc_library_host_static {
name: "libinit_host",
defaults: ["init_host_defaults"],
- srcs: init_common_sources + init_host_sources,
+ srcs: [
+ "noop_builtins.cpp",
+ ] + init_common_sources,
export_include_dirs: ["."],
+ generated_headers: [
+ "noop_builtin_function_map",
+ ],
proto: {
export_proto_headers: true,
},