Merge "adbd: make libadbd_services cc_library again." into rvc-dev (575d8c2c) · Commits · e / os / android_system_core

adb/Android.bp

+3 −2

Original line number	Diff line number	Diff line
		@@ -429,7 +429,7 @@ cc_library_static {
		},
		}

		cc_library_static {
		cc_library {
		name: "libadbd_services",
		defaults: ["adbd_defaults", "host_adbd_supported"],
		recovery_available: true,
		@@ -464,6 +464,7 @@ cc_library_static {
		"libbase",
		"libcrypto",
		"libcrypto_utils",
		"libcutils_sockets",
		"liblog",
		],

		@@ -515,6 +516,7 @@ cc_library {
		"libadb_tls_connection",
		"libadbd_auth",
		"libadbd_fs",
		"libadbd_services",
		"libasyncio",
		"libbase",
		"libcrypto",
		@@ -533,7 +535,6 @@ cc_library {
		},

		static_libs: [
		"libadbd_services",
		"libcutils_sockets",
		"libdiagnose_usb",
		"libmdnssd",

+2 −5

Original line number	Diff line number	Diff line
		@@ -45,13 +45,9 @@ cc_library_headers {
		}

		// Socket specific parts of libcutils that are safe to statically link into an APEX.
		cc_library_static {
		cc_library {
		name: "libcutils_sockets",
		vendor_available: true,
		vndk: {
		enabled: true,
		support_system_process: true,
		},
		recovery_available: true,
		host_supported: true,
		native_bridge_supported: true,
		@@ -62,6 +58,7 @@ cc_library_static {

		export_include_dirs: ["include"],

		shared_libs: ["liblog"],
		srcs: ["sockets.cpp"],
		target: {
		linux_bionic: {