Merge "Revert "Use more shared libraries in adb and init."" into stage-aosp-master (c67c7f9a) · Commits · e / os / android_system_core

adb/Android.bp

+24 −29

Original line number	Original line	Diff line number	Diff line
	@@ -277,7 +277,7 @@ cc_binary_host {
	},		},
	}		}

	cc_library {		cc_library_static {
	name: "libadbd",		name: "libadbd",
	defaults: ["adb_defaults"],		defaults: ["adb_defaults"],
	recovery_available: true,		recovery_available: true,
	@@ -288,36 +288,16 @@ cc_library {
	"daemon/auth.cpp",		"daemon/auth.cpp",
	"daemon/usb.cpp",		"daemon/usb.cpp",
	"daemon/jdwp_service.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: [		static_libs: [
	"libavb_user",
	"libdiagnose_usb",
	"libfec",
	"libfec_rs",
	"libfs_mgr",
	"libmdnssd",
	"libqemu_pipe",
	"libsquashfs_utils",
	"libselinux",
	],

	shared_libs: [
	"libasyncio",		"libasyncio",
	"libbootloader_message",		"libbootloader_message",
	"libbase",
	"libcrypto_utils",		"libcrypto_utils",
	"libcrypto",		"libcrypto",
	"libcutils",		"libdiagnose_usb",
	"libext4_utils",		"libqemu_pipe",
	"liblog",		"libbase",
	],		],

	export_include_dirs: [		export_include_dirs: [
	@@ -333,6 +313,13 @@ cc_binary {

	srcs: [		srcs: [
	"daemon/main.cpp",		"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: [		cflags: [
	@@ -344,19 +331,27 @@ cc_binary {
	keep_symbols: true,		keep_symbols: true,
	},		},

	shared_libs: [		static_libs: [
	"libadbd",		"libadbd",
	"libasyncio",		"libasyncio",
	"libbase",		"libavb_user",
	"libbootloader_message",		"libbootloader_message",
	"libcap",
	"libcrypto_utils",		"libcrypto_utils",
	"libcrypto",		"libcrypto",
	"libcutils",		"libdiagnose_usb",
	"libext4_utils",		"libfec",
			"libfec_rs",
			"libfs_mgr",
	"liblog",		"liblog",
			"libext4_utils",
			"libmdnssd",
	"libminijail",		"libminijail",
	"libselinux",		"libselinux",
			"libsquashfs_utils",
			"libqemu_pipe",

			"libbase",
			"libcutils",
	],		],
	}		}

adb/transport_local.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -428,10 +428,6 @@ void local_init(int port)
	std::thread(func, port).detach();		std::thread(func, port).detach();
	}		}

	std::string getEmulatorSerialString(int console_port) {
	return android::base::StringPrintf("emulator-%d", console_port);
	}

	#if ADB_HOST		#if ADB_HOST
	struct EmulatorConnection : public FdConnection {		struct EmulatorConnection : public FdConnection {
	EmulatorConnection(unique_fd fd, int local_port)		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;		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) {		atransport* find_emulator_transport_by_adb_port(int adb_port) {
	std::lock_guard<std::mutex> lock(local_transports_lock);		std::lock_guard<std::mutex> lock(local_transports_lock);
	return find_emulator_transport_by_adb_port_locked(adb_port);		return find_emulator_transport_by_adb_port_locked(adb_port);

fs_mgr/Android.bp

+7 −14

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ cc_defaults {
	],		],
	}		}

	cc_library {		cc_library_static {
	name: "libfs_mgr",		name: "libfs_mgr",
	defaults: ["fs_mgr_defaults"],		defaults: ["fs_mgr_defaults"],
	recovery_available: true,		recovery_available: true,
	@@ -44,24 +44,18 @@ cc_library {
	"fs_mgr_avb_ops.cpp",		"fs_mgr_avb_ops.cpp",
	"fs_mgr_dm_linear.cpp",		"fs_mgr_dm_linear.cpp",
	],		],
	shared_libs: [		static_libs: [
	"libfec",		"libfec",
	"libfec_rs",		"libfec_rs",
	"libbase",		"libbase",
	"libcrypto_utils",		"libcrypto_utils",
	"libcrypto",		"libcrypto",
	"libcutils",
	"libext4_utils",		"libext4_utils",
	"libkeyutils",
	"liblog",
	"liblogwrap",
	"libsquashfs_utils",		"libsquashfs_utils",
	"libselinux",		"libselinux",
	],
	static_libs: [
	"libavb",		"libavb",
	"libdm",
	"libfstab",		"libfstab",
			"libdm",
	"liblp",		"liblp",
	],		],
	export_static_lib_headers: [		export_static_lib_headers: [
	@@ -71,8 +65,9 @@ cc_library {
	],		],
	whole_static_libs: [		whole_static_libs: [
	"liblp",		"liblp",
	"libfstab",		"liblogwrap",
	"libdm",		"libdm",
			"libfstab",
	],		],
	cppflags: [		cppflags: [
	"-DALLOW_ADBD_DISABLE_VERITY=0",		"-DALLOW_ADBD_DISABLE_VERITY=0",
	@@ -87,7 +82,7 @@ cc_library {
	},		},
	}		}

	cc_library {		cc_library_static {
	name: "libfstab",		name: "libfstab",
	vendor_available: true,		vendor_available: true,
	recovery_available: true,		recovery_available: true,
	@@ -98,7 +93,5 @@ cc_library {
	"fs_mgr_slotselect.cpp",		"fs_mgr_slotselect.cpp",
	],		],
	export_include_dirs: ["include_fstab"],		export_include_dirs: ["include_fstab"],
	shared_libs: [		header_libs: ["libbase_headers"],
	"libbase",
	],
	}		}

fs_mgr/libdm/Android.bp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	// limitations under the License.		// limitations under the License.
	//		//

	cc_library {		cc_library_static {
	name: "libdm",		name: "libdm",
	defaults: ["fs_mgr_defaults"],		defaults: ["fs_mgr_defaults"],
	recovery_available: true,		recovery_available: true,
	@@ -32,9 +32,9 @@ cc_library {
	"loop_control.cpp",		"loop_control.cpp",
	],		],

	shared_libs: [		header_libs: [
	"libbase",		"libbase_headers",
	"liblog",		"liblog_headers",
	],		],
	}		}

init/Android.bp

+8 −9

Original line number	Original line	Diff line number	Diff line
	@@ -59,9 +59,17 @@ cc_defaults {
	},		},
	},		},
	static_libs: [		static_libs: [
			"libbootloader_message",
			"libfs_mgr",
			"libfec",
			"libfec_rs",
	"libhidl-gen-utils",		"libhidl-gen-utils",
	"libsquashfs_utils",		"libsquashfs_utils",
			"liblogwrap",
			"libext4_utils",
	"libseccomp_policy",		"libseccomp_policy",
			"libcrypto_utils",
			"libsparse",
	"libprocessgroup",		"libprocessgroup",
	"libavb",		"libavb",
	"libkeyutils",		"libkeyutils",
	@@ -70,22 +78,13 @@ cc_defaults {
	"libpropertyinfoparser",		"libpropertyinfoparser",
	],		],
	shared_libs: [		shared_libs: [
	"libbootloader_message",
	"libcrypto_utils",
	"libcutils",		"libcutils",
	"libbase",		"libbase",
	"libc",		"libc",
	"libext4_utils",
	"libfs_mgr",
	"libfec",
	"libfec_rs",
	"liblog",		"liblog",
	"liblogwrap",
	"libcrypto",		"libcrypto",
	"libc++",		"libc++",
	"libdl",		"libdl",
	"libselinux",
	"libsparse",
	"libz",		"libz",
	"libselinux",		"libselinux",
	],		],