From d5d5ba1644eabc64a449e73aad9fc50d186ef508 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Wed, 22 Apr 2020 17:33:00 -0700
Subject: [PATCH] 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.

Test: adbd on host
Change-Id: I6c039b325308fb8c36dfe5c1d090ff4ebe9e3433
---
 adb/Android.bp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/adb/Android.bp b/adb/Android.bp
index d6bc47e16..432770cd4 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -593,7 +593,6 @@ cc_library {
 cc_binary {
     name: "adbd",
     defaults: ["adbd_defaults", "host_adbd_supported", "libadbd_binary_dependencies"],
-    stl: "libc++_static",
     recovery_available: true,
     apex_available: ["com.android.adbd"],