commit 2081cf31b36127eabf6efadeb8e58fe664b7bf77
author Josh Gao <jmgao@google.com> Wed Apr 22 17:33:00 2020 -0700
committer Josh Gao <jmgao@google.com> Thu May 21 14:55:38 2020 -0700
tree dd25752e8c93be6afd88de9dda9d8ddb34b3f483
parent 19685064b957d1f47d86d5c6b07869b895afd66b

adbd: don't use libc++_static.

We have dependencies that use libc++_shared, which results in ODR
violation manifesting as host adbd crashing on launch in libc++ locale
initialization.

Bug: http://b/151056300
Test: adbd on host
Change-Id: I6c039b325308fb8c36dfe5c1d090ff4ebe9e3433
(cherry picked from commit d5d5ba1644eabc64a449e73aad9fc50d186ef508)

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index 0394bf6..214e207 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -567,7 +567,6 @@
 cc_binary {
     name: "adbd",
     defaults: ["adbd_defaults", "host_adbd_supported", "libadbd_binary_dependencies"],
-    stl: "libc++_static",
     recovery_available: true,
     apex_available: ["com.android.adbd"],