minadbd: statically link libadbd. am: 22beef1b28 am: 9267225df0 am: 2526ae8aeb (f41f9e2f) · Commits · e / os / android_bootable_recovery

minadbd/Android.bp

+9 −3

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@ cc_defaults {

		// `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing
		// the sideload service only.
		cc_library {
		cc_library_static {
		name: "libminadbd_services",
		recovery_available: true,

		@@ -79,6 +79,8 @@ cc_binary {

		defaults: [
		"minadbd_defaults",
		"libadbd_binary_dependencies",
		"librecovery_utils_defaults",
		],

		srcs: [
		@@ -86,10 +88,14 @@ cc_binary {
		],

		shared_libs: [
		"libadbd",
		"libbase",
		"libcrypto",
		],

		static_libs: [
		"libminadbd_services",
		"libfusesideload",
		"librecovery_utils",
		],

		required: [
		@@ -104,6 +110,7 @@ cc_test {
		defaults: [
		"minadbd_defaults",
		"librecovery_utils_defaults",
		"libadbd_binary_dependencies",
		],

		srcs: [
		@@ -116,7 +123,6 @@ cc_test {
		"libfusesideload",
		"librecovery_utils",
		"libotautil",
		"libadbd",
		],

		shared_libs: [

+4 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,10 @@ static void WipeDeviceService(unique_fd fd, const std::string& args) {
		}
		}

		asocket* daemon_service_to_socket(std::string_view) {
		return nullptr;
		}

		unique_fd daemon_service_to_fd(std::string_view name, atransport* /* transport */) {
		// Common services that are supported both in sideload and rescue modes.
		if (android::base::ConsumePrefix(&name, "reboot:")) {