Merge changes from topic "minadbd_static_libadbd" into rvc-dev am: 3db222694d (1df3958d) · Commits · e / os / android_system_core

adb/Android.bp

+56 −38

Original line number	Original line	Diff line number	Diff line
	@@ -114,6 +114,44 @@ cc_defaults {
	},		},
	}		}

			cc_defaults {
			name: "libadbd_binary_dependencies",
			static_libs: [
			"libadb_crypto",
			"libadb_pairing_connection",
			"libadb_tls_connection",
			"libadbd",
			"libadbd_core",
			"libadbconnection_server",
			"libasyncio",
			"libbrotli",
			"libcutils_sockets",
			"libdiagnose_usb",
			"libmdnssd",
			"libbase",

			"libadb_protos",
			],

			shared_libs: [
			"libadbd_auth",
			"libadbd_fs",
			"libcrypto",
			"libcrypto_utils",
			"liblog",
			"libselinux",
			],

			target: {
			recovery: {
			exclude_static_libs: [
			"libadb_pairing_auth",
			"libadb_pairing_connection",
			],
			},
			},
			}

	// libadb		// libadb
	// =========================================================		// =========================================================
	// These files are compiled for both the host and the device.		// These files are compiled for both the host and the device.
	@@ -365,6 +403,7 @@ cc_library_static {
	"libbase",		"libbase",
	"libcrypto",		"libcrypto",
	"libcrypto_utils",		"libcrypto_utils",
			"libcutils_sockets",
	"liblog",		"liblog",
	],		],

	@@ -418,13 +457,15 @@ cc_library {
	"libadb_pairing_connection",		"libadb_pairing_connection",
	"libadb_protos",		"libadb_protos",
	"libadb_tls_connection",		"libadb_tls_connection",
	"libadbd_auth",
	"libadbd_fs",
	"libasyncio",		"libasyncio",
	"libbase",		"libbase",
	"libcrypto",
	"libcrypto_utils",		"libcrypto_utils",
	"libcutils_sockets",		"libcutils_sockets",

			// APEX dependencies.
			"libadbd_auth",
			"libadbd_fs",
			"libcrypto",
	"liblog",		"liblog",
	],		],

	@@ -464,25 +505,21 @@ cc_library {
	// libminadbd wants both, as it's used to build native tests.		// libminadbd wants both, as it's used to build native tests.
	compile_multilib: "both",		compile_multilib: "both",

	// libadbd doesn't build any additional source, but to expose libadbd_core as a shared library.
	whole_static_libs: [
	"libadbconnection_server",
	"libadbd_core",
	],

	shared_libs: [		shared_libs: [
	"libadb_crypto",		"libadb_crypto",
	"libadb_pairing_connection",		"libadb_pairing_connection",
	"libadb_tls_connection",		"libadb_tls_connection",
	"libadbd_auth",
	"libadbd_fs",
	"libadbd_services",
	"libasyncio",		"libasyncio",
	"libbase",		"libbase",
	"libcrypto",		"libcrypto",
	"libcrypto_utils",		"libcrypto_utils",
	"liblog",		"liblog",
	"libselinux",		"libselinux",

			// APEX dependencies on the system image.
			"libadbd_auth",
			"libadbd_fs",
			"libadbd_services",
	],		],

	target: {		target: {
	@@ -495,6 +532,7 @@ cc_library {
	},		},

	static_libs: [		static_libs: [
			"libadbd_core",
	"libbrotli",		"libbrotli",
	"libcutils_sockets",		"libcutils_sockets",
	"libdiagnose_usb",		"libdiagnose_usb",
	@@ -509,7 +547,7 @@ cc_library {

	cc_binary {		cc_binary {
	name: "adbd",		name: "adbd",
	defaults: ["adbd_defaults", "host_adbd_supported"],		defaults: ["adbd_defaults", "host_adbd_supported", "libadbd_binary_dependencies"],
	stl: "libc++_static",		stl: "libc++_static",
	recovery_available: true,		recovery_available: true,

	@@ -527,31 +565,17 @@ cc_binary {
	},		},

	static_libs: [		static_libs: [
	"libadb_crypto",
	"libadb_tls_connection",
	"libadbconnection_server",
	"libadbd",		"libadbd",
	"libadbd_services",		"libadbd_services",
	"libasyncio",		"libasyncio",
	"libbase",
	"libbrotli",
	"libcap",		"libcap",
	"libcrypto_utils",
	"libcutils_sockets",
	"libdiagnose_usb",
	"libmdnssd",
	"libminijail",		"libminijail",
	"libssl",		"libssl",
	],		],

	shared_libs: [		shared_libs: [
	"libadb_pairing_connection",
	"libadb_protos",		"libadb_protos",
	"libadbd_auth",		"libadbd_auth",
	"libadbd_fs",
	"libcrypto",
	"liblog",
	"libselinux",
	],		],

	target: {		target: {
	@@ -623,8 +647,7 @@ cc_binary {
	cc_test {		cc_test {
	name: "adbd_test",		name: "adbd_test",

	defaults: ["adbd_defaults"],		defaults: ["adbd_defaults", "libadbd_binary_dependencies"],
	stl: "libc++_static",

	recovery_available: false,		recovery_available: false,
	srcs: libadb_test_srcs + [		srcs: libadb_test_srcs + [
	@@ -635,21 +658,16 @@ cc_test {
	"shell_service_protocol_test.cpp",		"shell_service_protocol_test.cpp",
	],		],

			shared_libs: [
			"liblog",
			],

	static_libs: [		static_libs: [
	"libadbd",		"libadbd",
	"libadbd_auth",		"libadbd_auth",
	"libadb_crypto_static",
	"libadb_pairing_connection_static",
	"libadb_tls_connection_static",
	"libbase",		"libbase",
	"libcrypto_utils",		"libcrypto_utils",
	"libcrypto_static",
	"libcutils_sockets",
	"libdiagnose_usb",
	"liblog",
	"libusb",		"libusb",
	"libmdnssd",
	"libselinux",
	],		],
	test_suites: ["device-tests", "mts"],		test_suites: ["device-tests", "mts"],
	require_root: true,		require_root: true,

adb/crypto/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,7 @@ cc_defaults {

	visibility: [		visibility: [
	"//system/core/adb:__subpackages__",		"//system/core/adb:__subpackages__",
			"//bootable/recovery/minadbd:__subpackages__",
	],		],

	host_supported: true,		host_supported: true,

adb/pairing_connection/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,9 @@ cc_defaults {
	"//art:__subpackages__",		"//art:__subpackages__",
	"//system/core/adb:__subpackages__",		"//system/core/adb:__subpackages__",
	"//frameworks/base/services:__subpackages__",		"//frameworks/base/services:__subpackages__",

			// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
			"//bootable/recovery/minadbd:__subpackages__",
	],		],
	apex_available: [		apex_available: [
	"com.android.adbd",		"com.android.adbd",

adb/proto/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,9 @@ cc_defaults {

	visibility: [		visibility: [
	"//system/core/adb:__subpackages__",		"//system/core/adb:__subpackages__",

			// This needs to be visible to minadbd, even though it's removed via exclude_shared_libs.
			"//bootable/recovery/minadbd:__subpackages__",
	],		],

	stl: "libc++_static",		stl: "libc++_static",

adb/tls/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,7 @@ cc_defaults {
	recovery_available: true,		recovery_available: true,

	visibility: [		visibility: [
			"//bootable/recovery/minadbd:__subpackages__",
	"//system/core/adb:__subpackages__",		"//system/core/adb:__subpackages__",
	],		],