init: move property_service.cpp to libinit
service.cpp, which is part of libinit, references symbols in
property_service.cpp, which causes the linker to complain when linking
libinit.a in some situations.
Therefore, we move property_service.cpp to libinit.
Separately, this will make it easier to write tests for
property_service.cpp, which we will want to do in the future.
Test: build, init unit tests
Change-Id: If1cffa8510b97e9436efed3c8ea0724272383eba
diff --git a/init/Android.bp b/init/Android.bp
index d9cadc2..432c298 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -69,6 +69,7 @@
"import_parser.cpp",
"log.cpp",
"parser.cpp",
+ "property_service.cpp",
"service.cpp",
"tokenizer.cpp",
"uevent_listener.cpp",
@@ -81,7 +82,12 @@
"libselinux",
"liblog",
"libprocessgroup",
+ "libfs_mgr",
],
+ include_dirs: [
+ "system/core/mkbootimg",
+ ],
+
}
/*
@@ -105,15 +111,11 @@
"init.cpp",
"init_first_stage.cpp",
"keychords.cpp",
- "property_service.cpp",
"reboot.cpp",
"signal_handler.cpp",
"ueventd.cpp",
"watchdogd.cpp",
],
- include_dirs: [
- "system/core/mkbootimg"
- ],
static_libs: [
"libinit",
"libbootloader_message",