Delete many references to cuttlefish_auto_resources
After removing the use in SharedFD, many things no longer indirectly
depend on cuttlefish_auto_resources.
This change skips several build files that are deleted by other pending
changes, including vsoc_lib.
Bug: 144387776
Test: launch_cvd [-vm_manager=qemu_cli]
Change-Id: Ie62afa6863676e67fb382a9d657914781fd5ca77
diff --git a/common/frontend/socket_vsock_proxy/Android.bp b/common/frontend/socket_vsock_proxy/Android.bp
index d079e20..310244a 100644
--- a/common/frontend/socket_vsock_proxy/Android.bp
+++ b/common/frontend/socket_vsock_proxy/Android.bp
@@ -19,7 +19,6 @@
"main.cpp",
],
shared_libs: [
- "cuttlefish_auto_resources",
"libbase",
"libcuttlefish_fs",
"libcuttlefish_utils",
diff --git a/common/libs/device_config/Android.bp b/common/libs/device_config/Android.bp
index 36c8ddb..4900d35 100644
--- a/common/libs/device_config/Android.bp
+++ b/common/libs/device_config/Android.bp
@@ -25,7 +25,6 @@
"libbase",
"liblog",
"libcuttlefish_fs",
- "cuttlefish_auto_resources",
"libcuttlefish_utils",
],
target: {
diff --git a/common/libs/fs/Android.bp b/common/libs/fs/Android.bp
index 1824caf..9f5d55e 100644
--- a/common/libs/fs/Android.bp
+++ b/common/libs/fs/Android.bp
@@ -21,14 +21,12 @@
],
shared: {
shared_libs: [
- "cuttlefish_auto_resources",
"libbase",
"liblog",
],
},
static: {
static_libs: [
- "cuttlefish_auto_resources",
"libbase",
"liblog",
],
@@ -45,9 +43,6 @@
cc_library_static {
name: "libcuttlefish_fs_product",
- static_libs: [
- "cuttlefish_auto_resources_product",
- ],
srcs: [
"shared_buf.cc",
"shared_fd.cpp",
@@ -67,7 +62,6 @@
],
header_libs: ["cuttlefish_glog"],
shared_libs: [
- "cuttlefish_auto_resources",
"libcuttlefish_fs",
"libbase",
],
diff --git a/common/libs/net/Android.bp b/common/libs/net/Android.bp
index ea53f71..ba7bbd3 100644
--- a/common/libs/net/Android.bp
+++ b/common/libs/net/Android.bp
@@ -21,7 +21,6 @@
],
shared_libs: [
"libcuttlefish_fs",
- "cuttlefish_auto_resources",
"libbase",
],
defaults: ["cuttlefish_host_and_guest"],
@@ -36,7 +35,6 @@
shared_libs: [
"libcuttlefish_fs",
"cuttlefish_net",
- "cuttlefish_auto_resources",
"libbase",
],
static_libs: [
diff --git a/common/libs/tcp_socket/Android.bp b/common/libs/tcp_socket/Android.bp
index d60ccb2..c5f9550 100644
--- a/common/libs/tcp_socket/Android.bp
+++ b/common/libs/tcp_socket/Android.bp
@@ -19,7 +19,6 @@
"tcp_socket.cpp",
],
shared_libs: [
- "cuttlefish_auto_resources",
"libbase",
"libcuttlefish_fs",
"liblog",
diff --git a/common/libs/utils/Android.bp b/common/libs/utils/Android.bp
index f2a5aff..7330315 100644
--- a/common/libs/utils/Android.bp
+++ b/common/libs/utils/Android.bp
@@ -31,14 +31,12 @@
shared_libs: [
"libbase",
"libcuttlefish_fs",
- "cuttlefish_auto_resources",
],
},
static: {
static_libs: [
"libbase",
"libcuttlefish_fs",
- "cuttlefish_auto_resources",
],
},
defaults: ["cuttlefish_host_and_guest"],
diff --git a/guest/commands/ip_link_add/Android.bp b/guest/commands/ip_link_add/Android.bp
index d84a5d1..6c155f0 100644
--- a/guest/commands/ip_link_add/Android.bp
+++ b/guest/commands/ip_link_add/Android.bp
@@ -21,7 +21,6 @@
],
shared_libs: [
"cuttlefish_net",
- "cuttlefish_auto_resources",
],
defaults: ["cuttlefish_guest_only"]
}
diff --git a/guest/commands/setup_wifi/Android.bp b/guest/commands/setup_wifi/Android.bp
index ec89852..182d885 100644
--- a/guest/commands/setup_wifi/Android.bp
+++ b/guest/commands/setup_wifi/Android.bp
@@ -21,7 +21,6 @@
],
shared_libs: [
"cuttlefish_net",
- "cuttlefish_auto_resources",
"libbase",
"liblog",
],
diff --git a/guest/commands/usbforward/Android.bp b/guest/commands/usbforward/Android.bp
index a639567..fe390e6 100644
--- a/guest/commands/usbforward/Android.bp
+++ b/guest/commands/usbforward/Android.bp
@@ -22,7 +22,6 @@
"transport_request.cpp",
],
shared_libs: [
- "cuttlefish_auto_resources",
"libcuttlefish_fs",
"libusb",
"libbase",
diff --git a/guest/commands/vsoc_input_service/Android.bp b/guest/commands/vsoc_input_service/Android.bp
index f2e197f..6c99127 100644
--- a/guest/commands/vsoc_input_service/Android.bp
+++ b/guest/commands/vsoc_input_service/Android.bp
@@ -28,7 +28,6 @@
"libgflags",
],
shared_libs: [
- "cuttlefish_auto_resources",
"libcuttlefish_device_config",
"libcuttlefish_fs",
"libbase",
diff --git a/guest/hals/hwcomposer/common/Android.bp b/guest/hals/hwcomposer/common/Android.bp
index 1b5125a..25d02f8 100644
--- a/guest/hals/hwcomposer/common/Android.bp
+++ b/guest/hals/hwcomposer/common/Android.bp
@@ -29,7 +29,6 @@
"libyuv_static",
],
shared_libs: [
- "cuttlefish_auto_resources",
"liblog",
"libhardware",
"libbase",
diff --git a/guest/hals/hwcomposer/cutf_cvm/Android.bp b/guest/hals/hwcomposer/cutf_cvm/Android.bp
index 3835765..5041b70 100644
--- a/guest/hals/hwcomposer/cutf_cvm/Android.bp
+++ b/guest/hals/hwcomposer/cutf_cvm/Android.bp
@@ -31,7 +31,6 @@
"hwcomposer_common"
],
shared_libs: [
- "cuttlefish_auto_resources",
"liblog",
"libhardware",
"libbase",
diff --git a/guest/hals/ril/Android.mk b/guest/hals/ril/Android.mk
index 77db038..b37e257 100644
--- a/guest/hals/ril/Android.mk
+++ b/guest/hals/ril/Android.mk
@@ -26,7 +26,6 @@
${CUTTLEFISH_LIBRIL_NAME} \
libcuttlefish_fs \
cuttlefish_net \
- cuttlefish_auto_resources \
libbase \
libcuttlefish_device_config \
diff --git a/guest/monitoring/tombstone_transmit/Android.bp b/guest/monitoring/tombstone_transmit/Android.bp
index 1e89183..500a5f4 100644
--- a/guest/monitoring/tombstone_transmit/Android.bp
+++ b/guest/monitoring/tombstone_transmit/Android.bp
@@ -21,7 +21,6 @@
static_libs: [
"libcuttlefish_fs_product",
"libgflags",
- "cuttlefish_auto_resources_product",
"liblog",
"libbase",
"libcutils",
diff --git a/host/commands/assemble_cvd/Android.bp b/host/commands/assemble_cvd/Android.bp
index 75d85d0..18b846f 100644
--- a/host/commands/assemble_cvd/Android.bp
+++ b/host/commands/assemble_cvd/Android.bp
@@ -46,7 +46,6 @@
"cdisk_spec",
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
"libbase",
"libnl",
"libprotobuf-cpp-full",
diff --git a/host/commands/config_server/Android.bp b/host/commands/config_server/Android.bp
index 07d832a..fcf6d39 100644
--- a/host/commands/config_server/Android.bp
+++ b/host/commands/config_server/Android.bp
@@ -26,7 +26,6 @@
"libcuttlefish_fs",
"liblog",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
"libcuttlefish_device_config",
],
static_libs: [
diff --git a/host/commands/console_forwarder/Android.bp b/host/commands/console_forwarder/Android.bp
index 57dacfe..a090e98 100644
--- a/host/commands/console_forwarder/Android.bp
+++ b/host/commands/console_forwarder/Android.bp
@@ -25,7 +25,6 @@
"libbase",
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
],
static_libs: [
"libcuttlefish_host_config",
diff --git a/host/commands/cvd_status/Android.bp b/host/commands/cvd_status/Android.bp
index 7196e07..3b1cbbc 100644
--- a/host/commands/cvd_status/Android.bp
+++ b/host/commands/cvd_status/Android.bp
@@ -25,7 +25,6 @@
"libbase",
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
],
static_libs: [
"libcuttlefish_host_config",
diff --git a/host/commands/fetcher/Android.bp b/host/commands/fetcher/Android.bp
index 6af562c..0677d76 100644
--- a/host/commands/fetcher/Android.bp
+++ b/host/commands/fetcher/Android.bp
@@ -27,7 +27,6 @@
],
stl: "libc++_static",
static_libs: [
- "cuttlefish_auto_resources",
"libbase",
"libcuttlefish_host_config",
"libcuttlefish_fs",
diff --git a/host/commands/kernel_log_monitor/Android.bp b/host/commands/kernel_log_monitor/Android.bp
index a7197e5..54dda47 100644
--- a/host/commands/kernel_log_monitor/Android.bp
+++ b/host/commands/kernel_log_monitor/Android.bp
@@ -25,7 +25,6 @@
shared_libs: [
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
"libbase",
],
static_libs: [
diff --git a/host/commands/launch/Android.bp b/host/commands/launch/Android.bp
index 6dd6426..dafe990 100644
--- a/host/commands/launch/Android.bp
+++ b/host/commands/launch/Android.bp
@@ -26,7 +26,6 @@
shared_libs: [
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
"libbase",
"libnl",
],
diff --git a/host/commands/logcat_receiver/Android.bp b/host/commands/logcat_receiver/Android.bp
index 16f3bf9..72438c7 100644
--- a/host/commands/logcat_receiver/Android.bp
+++ b/host/commands/logcat_receiver/Android.bp
@@ -26,7 +26,6 @@
"libcuttlefish_fs",
"liblog",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
],
static_libs: [
"libcuttlefish_host_config",
diff --git a/host/commands/run_cvd/Android.bp b/host/commands/run_cvd/Android.bp
index a8621e9..a7893fe 100644
--- a/host/commands/run_cvd/Android.bp
+++ b/host/commands/run_cvd/Android.bp
@@ -26,7 +26,6 @@
shared_libs: [
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
"libbase",
"libnl"
],
diff --git a/host/commands/stop_cvd/Android.bp b/host/commands/stop_cvd/Android.bp
index b8322b5..ad279bb 100644
--- a/host/commands/stop_cvd/Android.bp
+++ b/host/commands/stop_cvd/Android.bp
@@ -25,7 +25,6 @@
"libbase",
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
],
static_libs: [
"libcuttlefish_host_config",
diff --git a/host/commands/tombstone_receiver/Android.bp b/host/commands/tombstone_receiver/Android.bp
index 5f5a5a5..bd32cae 100644
--- a/host/commands/tombstone_receiver/Android.bp
+++ b/host/commands/tombstone_receiver/Android.bp
@@ -26,7 +26,6 @@
"libcuttlefish_fs",
"liblog",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
],
static_libs: [
"libcuttlefish_host_config",
diff --git a/host/commands/virtual_usb_manager/Android.bp b/host/commands/virtual_usb_manager/Android.bp
index 40c8c74..6669b8c 100644
--- a/host/commands/virtual_usb_manager/Android.bp
+++ b/host/commands/virtual_usb_manager/Android.bp
@@ -36,7 +36,6 @@
shared_libs: [
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
"libbase",
],
static_libs: [
diff --git a/host/commands/virtual_usb_manager/usbip/Android.bp b/host/commands/virtual_usb_manager/usbip/Android.bp
index b01acb1..8a52b90 100644
--- a/host/commands/virtual_usb_manager/usbip/Android.bp
+++ b/host/commands/virtual_usb_manager/usbip/Android.bp
@@ -27,7 +27,6 @@
],
shared_libs: [
"libcuttlefish_fs",
- "cuttlefish_auto_resources",
"libbase",
],
static_libs: [
diff --git a/host/frontend/vnc_server/Android.bp b/host/frontend/vnc_server/Android.bp
index 210f21d..0e82b2f 100644
--- a/host/frontend/vnc_server/Android.bp
+++ b/host/frontend/vnc_server/Android.bp
@@ -33,7 +33,6 @@
"libcuttlefish_fs",
"libcuttlefish_utils",
"cuttlefish_tcp_socket",
- "cuttlefish_auto_resources",
"libbase",
],
static_libs: [
diff --git a/host/libs/config/Android.bp b/host/libs/config/Android.bp
index 283053e..d88b206 100644
--- a/host/libs/config/Android.bp
+++ b/host/libs/config/Android.bp
@@ -25,7 +25,6 @@
shared_libs: [
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
"libbase",
"libgflags",
],
diff --git a/host/libs/vm_manager/Android.bp b/host/libs/vm_manager/Android.bp
index eadcb12..61cda54 100644
--- a/host/libs/vm_manager/Android.bp
+++ b/host/libs/vm_manager/Android.bp
@@ -26,7 +26,6 @@
shared_libs: [
"libcuttlefish_fs",
"libcuttlefish_utils",
- "cuttlefish_auto_resources",
"libbase",
"libicuuc",
],