From 22c2202e7555e905119c33cf866c659f81aaeb75 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Mon, 23 Jul 2018 17:44:32 +0000 Subject: [PATCH] Revert "Use more shared libraries in adb and init." This reverts commit fbd79687e6980cced292108a64eab247fa6d612b. Reason for revert: b/111734137 Change-Id: I70e23ed20d16821a555b448d4ac76fe9e130afa5 --- adb/Android.bp | 53 +++++++++++++++++++---------------------- adb/transport_local.cpp | 8 +++---- fs_mgr/Android.bp | 21 ++++++---------- fs_mgr/libdm/Android.bp | 8 +++---- init/Android.bp | 17 +++++++------ 5 files changed, 47 insertions(+), 60 deletions(-) diff --git a/adb/Android.bp b/adb/Android.bp index d35c3a381..2a9a57985 100644 --- a/adb/Android.bp +++ b/adb/Android.bp @@ -277,7 +277,7 @@ cc_binary_host { }, } -cc_library { +cc_library_static { name: "libadbd", defaults: ["adb_defaults"], recovery_available: true, @@ -288,36 +288,16 @@ cc_library { "daemon/auth.cpp", "daemon/usb.cpp", "daemon/jdwp_service.cpp", - "daemon/mdns.cpp", - "daemon/file_sync_service.cpp", - "daemon/framebuffer_service.cpp", - "daemon/remount_service.cpp", - "daemon/set_verity_enable_state_service.cpp", - "daemon/shell_service.cpp", - "shell_service_protocol.cpp", ], static_libs: [ - "libavb_user", - "libdiagnose_usb", - "libfec", - "libfec_rs", - "libfs_mgr", - "libmdnssd", - "libqemu_pipe", - "libsquashfs_utils", - "libselinux", - ], - - shared_libs: [ "libasyncio", "libbootloader_message", - "libbase", "libcrypto_utils", "libcrypto", - "libcutils", - "libext4_utils", - "liblog", + "libdiagnose_usb", + "libqemu_pipe", + "libbase", ], export_include_dirs: [ @@ -333,6 +313,13 @@ cc_binary { srcs: [ "daemon/main.cpp", + "daemon/mdns.cpp", + "daemon/file_sync_service.cpp", + "daemon/framebuffer_service.cpp", + "daemon/remount_service.cpp", + "daemon/set_verity_enable_state_service.cpp", + "daemon/shell_service.cpp", + "shell_service_protocol.cpp", ], cflags: [ @@ -344,19 +331,27 @@ cc_binary { keep_symbols: true, }, - shared_libs: [ + static_libs: [ "libadbd", "libasyncio", - "libbase", + "libavb_user", "libbootloader_message", - "libcap", "libcrypto_utils", "libcrypto", - "libcutils", - "libext4_utils", + "libdiagnose_usb", + "libfec", + "libfec_rs", + "libfs_mgr", "liblog", + "libext4_utils", + "libmdnssd", "libminijail", "libselinux", + "libsquashfs_utils", + "libqemu_pipe", + + "libbase", + "libcutils", ], } diff --git a/adb/transport_local.cpp b/adb/transport_local.cpp index abd2c312f..fa3823854 100644 --- a/adb/transport_local.cpp +++ b/adb/transport_local.cpp @@ -428,10 +428,6 @@ void local_init(int port) std::thread(func, port).detach(); } -std::string getEmulatorSerialString(int console_port) { - return android::base::StringPrintf("emulator-%d", console_port); -} - #if ADB_HOST struct EmulatorConnection : public FdConnection { EmulatorConnection(unique_fd fd, int local_port) @@ -466,6 +462,10 @@ static atransport* find_emulator_transport_by_adb_port_locked(int adb_port) return it->second; } +std::string getEmulatorSerialString(int console_port) { + return android::base::StringPrintf("emulator-%d", console_port); +} + atransport* find_emulator_transport_by_adb_port(int adb_port) { std::lock_guard lock(local_transports_lock); return find_emulator_transport_by_adb_port_locked(adb_port); diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp index ce1595ed9..a3ce879a9 100644 --- a/fs_mgr/Android.bp +++ b/fs_mgr/Android.bp @@ -30,7 +30,7 @@ cc_defaults { ], } -cc_library { +cc_library_static { name: "libfs_mgr", defaults: ["fs_mgr_defaults"], recovery_available: true, @@ -44,24 +44,18 @@ cc_library { "fs_mgr_avb_ops.cpp", "fs_mgr_dm_linear.cpp", ], - shared_libs: [ + static_libs: [ "libfec", "libfec_rs", "libbase", "libcrypto_utils", "libcrypto", - "libcutils", "libext4_utils", - "libkeyutils", - "liblog", - "liblogwrap", "libsquashfs_utils", "libselinux", - ], - static_libs: [ "libavb", - "libdm", "libfstab", + "libdm", "liblp", ], export_static_lib_headers: [ @@ -71,8 +65,9 @@ cc_library { ], whole_static_libs: [ "liblp", - "libfstab", + "liblogwrap", "libdm", + "libfstab", ], cppflags: [ "-DALLOW_ADBD_DISABLE_VERITY=0", @@ -87,7 +82,7 @@ cc_library { }, } -cc_library { +cc_library_static { name: "libfstab", vendor_available: true, recovery_available: true, @@ -98,7 +93,5 @@ cc_library { "fs_mgr_slotselect.cpp", ], export_include_dirs: ["include_fstab"], - shared_libs: [ - "libbase", - ], + header_libs: ["libbase_headers"], } diff --git a/fs_mgr/libdm/Android.bp b/fs_mgr/libdm/Android.bp index 8a3a34ffd..22af1238e 100644 --- a/fs_mgr/libdm/Android.bp +++ b/fs_mgr/libdm/Android.bp @@ -14,7 +14,7 @@ // limitations under the License. // -cc_library { +cc_library_static { name: "libdm", defaults: ["fs_mgr_defaults"], recovery_available: true, @@ -32,9 +32,9 @@ cc_library { "loop_control.cpp", ], - shared_libs: [ - "libbase", - "liblog", + header_libs: [ + "libbase_headers", + "liblog_headers", ], } diff --git a/init/Android.bp b/init/Android.bp index 094d914bd..5bbb7a09c 100644 --- a/init/Android.bp +++ b/init/Android.bp @@ -59,9 +59,17 @@ cc_defaults { }, }, static_libs: [ + "libbootloader_message", + "libfs_mgr", + "libfec", + "libfec_rs", "libhidl-gen-utils", "libsquashfs_utils", + "liblogwrap", + "libext4_utils", "libseccomp_policy", + "libcrypto_utils", + "libsparse", "libprocessgroup", "libavb", "libkeyutils", @@ -70,22 +78,13 @@ cc_defaults { "libpropertyinfoparser", ], shared_libs: [ - "libbootloader_message", - "libcrypto_utils", "libcutils", "libbase", "libc", - "libext4_utils", - "libfs_mgr", - "libfec", - "libfec_rs", "liblog", - "liblogwrap", "libcrypto", "libc++", "libdl", - "libselinux", - "libsparse", "libz", "libselinux", ],