From 7b93f287c2bce7520f2a80d7c059415d31221f2a Mon Sep 17 00:00:00 2001
From: Jeff Davidson <jpd@google.com>
Date: Fri, 6 Feb 2015 11:40:58 -0800
Subject: Include libc++ statically in aprotoc.

Allows us to include aprotoc as a prebuilt separate from the platform
build for use in unbundled projects.

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

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 609d5a3..1e093f2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -407,6 +407,10 @@ LOCAL_MODULE := aprotoc
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_MODULE_TAGS := optional
 
+# Build aprotoc as a standalone binary because we copy it 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