adb: split daemon services out of service_to_fd.
Let minadbd override daemon services by pulling out the daemon services
into a separate translation unit, that isn't compiled into libadbd.
Bug: http://b/111831478
Test: mma
Change-Id: Iecfebea371e03864108eca9a4d2e9cfd5db34749
diff --git a/adb/Android.bp b/adb/Android.bp
index 2a9a579..07f052f 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -292,7 +292,6 @@
static_libs: [
"libasyncio",
- "libbootloader_message",
"libcrypto_utils",
"libcrypto",
"libdiagnose_usb",
@@ -318,6 +317,7 @@
"daemon/framebuffer_service.cpp",
"daemon/remount_service.cpp",
"daemon/set_verity_enable_state_service.cpp",
+ "daemon/services.cpp",
"daemon/shell_service.cpp",
"shell_service_protocol.cpp",
],
@@ -359,6 +359,7 @@
name: "adbd_test",
defaults: ["adb_defaults"],
srcs: libadb_test_srcs + [
+ "daemon/services.cpp",
"daemon/shell_service.cpp",
"daemon/shell_service_test.cpp",
"shell_service_protocol.cpp",
@@ -368,6 +369,7 @@
static_libs: [
"libadbd",
"libbase",
+ "libbootloader_message",
"libcutils",
"libcrypto_utils",
"libcrypto",