From c25b0c5ecb37130f14edd599e4ca6e36fd576718 Mon Sep 17 00:00:00 2001 From: Joshua Duong Date: Sun, 9 Feb 2020 22:28:01 -0800 Subject: [PATCH] [adbwifi] Add adbd apex exported libs to system namespace. 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 | 4 ++++ contents/namespace/systemdefault.cc | 4 ++++ 2 files changed, 8 insertions(+) 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 @@ std::vector required_libs = { // statsd "libstatspull.so", "libstatssocket.so", + // adbd + "libadb_pairing_auth.so", + "libadb_pairing_connection.so", + "libadb_pairing_server.so", }; } // namespace diff --git a/contents/namespace/systemdefault.cc b/contents/namespace/systemdefault.cc index 98296ab..588890d 100644 --- a/contents/namespace/systemdefault.cc +++ b/contents/namespace/systemdefault.cc @@ -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()); -- 2.11.0