commit 0cb1103807293d5041a6214b1b466ff1df0f2b21
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 21:58:54 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 21:58:54 2020 +0000
tree 74e806e1b459ed4906f653a5aeb2f0a694a955c5
parent 0c1929cf78bb025fe1ae8d78fd0473830a650cc6
parent d62ab54b6e30d80c757071ba14a7155f518a5303

Merge "[adbwifi] Add adbd apex exported libs to system namespace." am: c005be7589 am: 6140ec2c59 am: d62ab54b6e

Change-Id: Iff0c1c60a3f70dca0fec7d0dcb2060a22f8c4010

contents/namespace/apexplatform.cc

diff --git a/contents/namespace/apexplatform.cc b/contents/namespace/apexplatform.cc
index 9e315f9..4d78bc5 100644
--- a/contents/namespace/apexplatform.cc
+++ b/contents/namespace/apexplatform.cc
@@ -46,6 +46,10 @@
     // statsd
     "libstatspull.so",
     "libstatssocket.so",
+    // adbd
+    "libadb_pairing_auth.so",
+    "libadb_pairing_connection.so",
+    "libadb_pairing_server.so",
 };
 }  // namespace
 

contents/namespace/systemdefault.cc

diff --git a/contents/namespace/systemdefault.cc b/contents/namespace/systemdefault.cc
index 37a5ea3..a9bfdb1 100644
--- a/contents/namespace/systemdefault.cc
+++ b/contents/namespace/systemdefault.cc
@@ -123,6 +123,10 @@
       // statsd
       "libstatspull.so",
       "libstatssocket.so",
+      // adbd
+      "libadb_pairing_auth.so",
+      "libadb_pairing_connection.so",
+      "libadb_pairing_server.so",
   });
 
   ns.AddProvides(GetSystemStubLibraries());