From 58e00bc69fc2e309384b09ec6088e65f3d322cd6 Mon Sep 17 00:00:00 2001
From: Jeff Davidson <jpd@google.com>
Date: Fri, 6 Feb 2015 15:14:56 -0800
Subject: Use libstdc++, not libc++_static, with protobuf.

libc++_static causes problems with some windows builds. libstdc++
reverts back to the old behavior of using the system's libstdc++ (or
libc++ on darwin).

Bug: 19285118
Change-Id: Ib4fca25da24746e55b620db63f2f810ba3794f3d
---
 Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 1e093f2..fcf9a21 100644
--- a/Android.mk
+++ b/Android.mk
@@ -407,9 +407,9 @@ LOCAL_MODULE := aprotoc
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_MODULE_TAGS := optional
 
-# Build aprotoc as a standalone binary because we copy it to
+# 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 := libc++_static
+LOCAL_CXX_STL := libstdc++
 
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_SRC_FILES := $(COMPILER_SRC_FILES)
-- 
cgit v1.1