[adbwifi] Add adbwifi_libs, TLS connection, and MDNS implementation.
Bug: 111434128, 119493510, 119494503
Test: Enable wireless debugging in Settings UI, click "pair with pairing code"
to generate pairing code.
On client, 'adb pair <ip_address>', enter pairing code at prompt and hit
enter. Pairing should complete.
'adb logcat'.
Change-Id: I86527bd3fc52e30a8e08ec5843dc3e100abf91fa
Exempt-From-Owner-Approval: approved already
diff --git a/Android.bp b/Android.bp
index 32581a2..1004483 100644
--- a/Android.bp
+++ b/Android.bp
@@ -225,9 +225,11 @@
srcs: libadb_srcs + [
"client/auth.cpp",
+ "client/adb_wifi.cpp",
"client/usb_libusb.cpp",
"client/usb_dispatch.cpp",
"client/transport_mdns.cpp",
+ "client/pairing/pairing_client.cpp",
],
generated_headers: ["platform_tools_version"],
@@ -257,6 +259,8 @@
static_libs: [
"libadb_crypto",
"libadb_protos",
+ "libadb_pairing_connection",
+ "libadb_tls_connection",
"libbase",
"libcrypto_utils",
"libcrypto",
@@ -266,6 +270,7 @@
"libutils",
"liblog",
"libcutils",
+ "libprotobuf-cpp-lite",
],
}
@@ -274,8 +279,12 @@
defaults: ["adb_defaults"],
srcs: libadb_test_srcs,
static_libs: [
- "libadb_crypto",
+ "libadb_crypto_static",
"libadb_host",
+ "libadb_pairing_auth_static",
+ "libadb_pairing_connection_static",
+ "libadb_protos_static",
+ "libadb_tls_connection_static",
"libbase",
"libcutils",
"libcrypto_utils",
@@ -283,6 +292,8 @@
"liblog",
"libmdnssd",
"libdiagnose_usb",
+ "libprotobuf-cpp-lite",
+ "libssl",
"libusb",
],
@@ -314,12 +325,16 @@
},
static_libs: [
+ "libadb_crypto_static",
+ "libadb_tls_connection_static",
+ "libadbd_auth",
"libbase",
"libcutils",
"libcrypto_utils",
"libcrypto_static",
"libdiagnose_usb",
"liblog",
+ "libssl",
"libusb",
],
}
@@ -354,6 +369,10 @@
static_libs: [
"libadb_crypto",
"libadb_host",
+ "libadb_pairing_auth",
+ "libadb_pairing_connection",
+ "libadb_protos",
+ "libadb_tls_connection",
"libandroidfw",
"libbase",
"libcutils",
@@ -365,6 +384,7 @@
"liblz4",
"libmdnssd",
"libprotobuf-cpp-lite",
+ "libssl",
"libusb",
"libutils",
"liblog",
@@ -415,6 +435,7 @@
srcs: libadb_srcs + libadb_linux_srcs + libadb_posix_srcs + [
"daemon/auth.cpp",
"daemon/jdwp_service.cpp",
+ "daemon/adb_wifi.cpp",
],
local_include_dirs: [
@@ -430,6 +451,9 @@
shared_libs: [
"libadb_crypto",
+ "libadb_pairing_connection",
+ "libadb_protos",
+ "libadb_tls_connection",
"libadbd_auth",
"libasyncio",
"libbase",
@@ -484,6 +508,10 @@
],
shared_libs: [
+ "libadb_crypto",
+ "libadb_pairing_connection",
+ "libadb_protos",
+ "libadb_tls_connection",
"libadbd_auth",
"libasyncio",
"libbase",
@@ -532,6 +560,9 @@
],
shared_libs: [
+ "libadb_crypto",
+ "libadb_pairing_connection",
+ "libadb_tls_connection",
"libadbd_auth",
"libadbd_services",
"libasyncio",
@@ -580,9 +611,14 @@
"libmdnssd",
"libminijail",
"libselinux",
+ "libssl",
],
shared_libs: [
+ "libadb_crypto",
+ "libadb_pairing_connection",
+ "libadb_protos",
+ "libadb_tls_connection",
"libadbd_auth",
"libcrypto",
],
@@ -659,6 +695,9 @@
static_libs: [
"libadbd",
"libadbd_auth",
+ "libadb_crypto_static",
+ "libadb_pairing_connection_static",
+ "libadb_tls_connection_static",
"libbase",
"libcutils",
"libcrypto_utils",
@@ -773,8 +812,12 @@
"fastdeploy/deploypatchgenerator/patch_utils_test.cpp",
],
static_libs: [
- "libadb_crypto",
+ "libadb_crypto_static",
"libadb_host",
+ "libadb_pairing_auth_static",
+ "libadb_pairing_connection_static",
+ "libadb_protos_static",
+ "libadb_tls_connection_static",
"libandroidfw",
"libbase",
"libcutils",
@@ -785,6 +828,7 @@
"liblog",
"libmdnssd",
"libprotobuf-cpp-lite",
+ "libssl",
"libusb",
"libutils",
"libziparchive",