commit 2068b3fce1cae72957dced91ea35578a8a690128
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 20:38:42 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 20:38:42 2020 +0000
tree 2e10e6aeb268c2f87ff1e9cda81b9988ef1a4b33
parent 9098237dc2029fce4314eb8d72a9c9f3b524d287
parent a2747b2a86f546a3686be17a3925aa39f7c376aa

Merge "adbd_auth: actually dynamically link it into adbd." am: 96209fd780 am: e4c51e4bee am: a2747b2a86

Change-Id: Ic000cba1d2180b0f24574c8932d74b4e74bea859

libs/adbd_auth/Android.bp

diff --git a/libs/adbd_auth/Android.bp b/libs/adbd_auth/Android.bp
index 9cf0143..8ac044c 100644
--- a/libs/adbd_auth/Android.bp
+++ b/libs/adbd_auth/Android.bp
@@ -20,11 +20,14 @@
         "-Wthread-safety",
         "-Werror",
     ],
+    stl: "libc++_static",
+
     srcs: ["adbd_auth.cpp"],
     export_include_dirs: ["include"],
 
     version_script: "libadbd_auth.map.txt",
     stubs: {
+        versions: ["1"],
         symbol_file: "libadbd_auth.map.txt",
     },
 
@@ -36,7 +39,7 @@
         }
     },
 
-    shared_libs: [
+    static_libs: [
         "libbase",
         "libcutils",
         "liblog",