From 16d5bc6ed5433a8b50ec8ecb9fa5a3364ce72628 Mon Sep 17 00:00:00 2001
From: Joshua Duong <joshuaduong@google.com>
Date: Sun, 9 Feb 2020 22:50:19 -0800
Subject: [PATCH] [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 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/adb/apex/Android.bp b/adb/apex/Android.bp
index b62a8ff14..01894552a 100644
--- a/adb/apex/Android.bp
+++ b/adb/apex/Android.bp
@@ -5,7 +5,12 @@ apex_defaults {
     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"],