commit e4c51e4bee27f30940b4e2fe5e486efa5c2c7333
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 20:17:53 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 03 20:17:53 2020 +0000
tree 42e44927169ceb98708add3820f4d8208caf0fa0
parent bd7016a59cdef6a9da82aceba72e17849010d5dd
parent 96209fd78080243e8402b193c66a717580aa2053

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

Change-Id: I7a86076e67972c9ff2ccbeb510ecedc7b07d2afe

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",