OSDN Git Service

[adbwifi] Add adbd apex exported libs to system namespace.
authorJoshua Duong <joshuaduong@google.com>
Mon, 10 Feb 2020 06:28:01 +0000 (22:28 -0800)
committerJoshua Duong <joshuaduong@google.com>
Fri, 21 Feb 2020 02:54:43 +0000 (18:54 -0800)
These libraries will be used by system_server
(libandroid_servers.so).

Bug: b/149181583
Bug: b/111434128

Test: boots, adbd is not crashing.
Test: cat /proc/`pidof system_server`/maps | grep libadb
Verify that only libadb_pairing_auth.so, libadb_pairing_connection.so,
and libadb_pairing_server.so are being used.
Test: cat /proc/`pidof adbd`/maps | grep libadb
Change-Id: I8b645c9aca2465d5231b3cb21ca85fc3ebfc9093

contents/namespace/apexplatform.cc
contents/namespace/systemdefault.cc

index 9e315f9..4d78bc5 100644 (file)
@@ -46,6 +46,10 @@ std::vector<std::string> required_libs = {
     // statsd
     "libstatspull.so",
     "libstatssocket.so",
+    // adbd
+    "libadb_pairing_auth.so",
+    "libadb_pairing_connection.so",
+    "libadb_pairing_server.so",
 };
 }  // namespace
 
index 98296ab..588890d 100644 (file)
@@ -123,6 +123,10 @@ Namespace BuildSystemDefaultNamespace([[maybe_unused]] const Context& ctx) {
       // statsd
       "libstatspull.so",
       "libstatssocket.so",
+      // adbd
+      "libadb_pairing_auth.so",
+      "libadb_pairing_connection.so",
+      "libadb_pairing_server.so",
   });
 
   ns.AddProvides(GetSystemStubLibraries());