commit 16d5bc6ed5433a8b50ec8ecb9fa5a3364ce72628
author Joshua Duong <joshuaduong@google.com> Sun Feb 09 22:50:19 2020 -0800
committer Joshua Duong <joshuaduong@google.com> Fri Feb 21 21:06:28 2020 +0000
tree 97401ae969485f4d0553c90a7c2a9885d7226d7b
parent c7a1fb8fd970c6fa41843f48cc7bcc02fd07800d

[adbd-apex] Export adbd libraries used by system_server.

Bug: b/111434128
Bug: b/149181583

Test: cat proc/`pidof system_server`/maps | grep libadb
Test: cat proc/`pidof adbd`/maps | grep libadb
Change-Id: Idd36ca31cba7e4dc2d8836d229b23665e69b42fb
Exempt-From-Owner-Approval: approved already

adb/apex/Android.bp

diff --git a/adb/apex/Android.bp b/adb/apex/Android.bp
index b62a8ff..0189455 100644
--- a/adb/apex/Android.bp
+++ b/adb/apex/Android.bp
@@ -5,7 +5,12 @@
     compile_multilib: "both",
     multilib: {
         both: {
-            native_shared_libs: ["libadbconnection_client"],
+            native_shared_libs: [
+                "libadb_pairing_auth",
+                "libadb_pairing_connection",
+                "libadb_pairing_server",
+                "libadbconnection_client",
+            ],
         },
     },
     prebuilts: ["com.android.adbd.init.rc"],