From 5d8f770b1ce4e689d6744d888ddff45b48ff2823 Mon Sep 17 00:00:00 2001
From: Tej Singh <singhtejinder@google.com>
Date: Mon, 6 Apr 2020 15:01:41 -0700
Subject: [PATCH] Link libc++ statically

Test: bit statsd_test:*
Test: bit libstatssocket_test:*
Test: bit libstatspull_test:*
Bug: 153349659
Change-Id: Ief3d0e062ed3e5cabf5b8b6198510caf3f64eefd
---
 libstats/pull/Android.bp   | 5 ++++-
 libstats/socket/Android.bp | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libstats/pull/Android.bp b/libstats/pull/Android.bp
index a7b5d9154..ef1c5c5bd 100644
--- a/libstats/pull/Android.bp
+++ b/libstats/pull/Android.bp
@@ -30,11 +30,11 @@ cc_defaults {
     shared_libs: [
         "libbinder_ndk",
         "liblog",
-        "statsd-aidl-ndk_platform",
         "libstatssocket",
     ],
     static_libs: [
         "libutils",
+        "statsd-aidl-ndk_platform",
     ],
 }
 cc_library_shared {
@@ -53,6 +53,9 @@ cc_library_shared {
         "com.android.os.statsd",
         "test_com.android.os.statsd",
     ],
+
+    stl: "libc++_static",
+
     // TODO(b/151102177): Enable it when the build error is fixed.
     header_abi_checker: {
         enabled: false,
diff --git a/libstats/socket/Android.bp b/libstats/socket/Android.bp
index b02ab42b2..c86d65031 100644
--- a/libstats/socket/Android.bp
+++ b/libstats/socket/Android.bp
@@ -54,6 +54,7 @@ cc_library {
             },
         },
     },
+    stl: "libc++_static",
 
     // enumerate stable entry points for APEX use
     stubs: {