Keep cvd server code in a dedicated library
Separated cvd server codes for readability/maintenance, and
keep them in the cvd server library.
Bug: 240830630
Test: run locally
Change-Id: I9e9f097f2f7332207c7e65a04f47216de295f861
diff --git a/host/commands/cvd/Android.bp b/host/commands/cvd/Android.bp
index d55299a..268d008 100644
--- a/host/commands/cvd/Android.bp
+++ b/host/commands/cvd/Android.bp
@@ -83,6 +83,27 @@
}
cc_library_host_static {
+ name: "libcvd_server",
+ srcs: [
+ "acloud_command.cpp",
+ "build_api.cpp",
+ "command_sequence.cpp",
+ "epoll_loop.cpp",
+ "instance_lock.cpp",
+ "instance_manager.cpp",
+ "help_command.cpp",
+ "scope_guard.cpp",
+ "server.cc",
+ "server_client.cpp",
+ "server_command.cpp",
+ "server_restart.cpp",
+ "server_shutdown.cpp",
+ "server_version.cpp",
+ ],
+ defaults: ["cvd_lib_defaults"],
+}
+
+cc_library_host_static {
name: "libfetch_cvd",
srcs: [
"fetch_cvd.cc",
@@ -94,6 +115,7 @@
name: "cvd_and_fetch_cvd_defaults",
static_libs: [
"libcvd_client",
+ "libcvd_server",
"libfetch_cvd",
],
defaults: ["cvd_lib_defaults"],
@@ -102,21 +124,7 @@
cc_library_host_static {
name: "cvd_and_fetch_cvd",
srcs: [
- "acloud_command.cpp",
- "build_api.cpp",
- "command_sequence.cpp",
- "epoll_loop.cpp",
- "instance_lock.cpp",
- "instance_manager.cpp",
- "help_command.cpp",
"main.cc",
- "scope_guard.cpp",
- "server.cc",
- "server_client.cpp",
- "server_command.cpp",
- "server_restart.cpp",
- "server_shutdown.cpp",
- "server_version.cpp",
],
defaults: ["cvd_and_fetch_cvd_defaults"],
}
