commit 0d7232c1b332377b251d1d3c05f7d843fe201571
author Josh Gao <jmgao@google.com> Fri Oct 25 14:55:13 2019 -0700
committer Josh Gao <jmgao@google.com> Tue Nov 05 23:36:35 2019 +0000
tree 709c0af0009f6b7d3036ddbaa58b13a44ec3ada6
parent 77e6187a84cc52d6a79f4ea6fd6a50034a7c340f

libadbconnection_server: remove dynamic dependencies.

Make it easier to audit adbd for unexpected dependencies by statically
linking libbase and the STL.

Test: adb shell su 0 cat /proc/`adb shell pidof adbd`/maps | cut -c 74- | sort | uniq
Change-Id: Ib124afb5f43d33e4f5a0180898a8beb1301fc80f

adbconnection/Android.bp

diff --git a/adbconnection/Android.bp b/adbconnection/Android.bp
index 5bbad72..239cecb 100644
--- a/adbconnection/Android.bp
+++ b/adbconnection/Android.bp
@@ -63,7 +63,10 @@
     srcs: ["adbconnection_server.cc"],
 
     export_include_dirs: ["include"],
-    shared_libs: ["libbase"],
+
+    stl: "libc++_static",
+    shared_libs: ["liblog"],
+    whole_static_libs: ["libbase"],
 
     defaults: ["art_defaults"],
     visibility: [