From fb64d7c381ae6443f7ef90ce67dc3d9d90f9af44 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 27 Aug 2015 16:18:32 -0700
Subject: Stop using libstdc++.

Statically link libc++ because we copy aprotoc to unbundled projects
where libc++.so may not be available.

Change-Id: I1f1abc015696c1ccd8600338c147d51aca2253a1
---
 Android.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 9b8d0ef..f6ca9c1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -424,9 +424,9 @@ LOCAL_MODULE := aprotoc
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_MODULE_TAGS := optional
 
-# Use the system's libstdc++ (libc++ on mac) because we copy aprotoc to
-# unbundled projects where libc++.so may not be available.
-LOCAL_CXX_STL := libstdc++
+# Statically link libc++ because we copy aprotoc to unbundled projects where
+# libc++.so may not be available.
+LOCAL_CXX_STL := libc++_static
 
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := $(COMPILER_SRC_FILES)
-- 
cgit v1.1