commit 2a4a023a541d16b2a8c66aed97748d0f0f376387
author Dan Albert <danalbert@google.com> Tue May 12 11:00:31 2015 -0700
committer Dan Albert <danalbert@google.com> Tue May 12 14:07:18 2015 -0700
tree 1a604d20d5d0d7c37ae12880724055db809e0e0b
parent 4415894579186c0c4f8d006ed625c0379b1b9d40

Fix using libc++_static in dynamic binaries.

Change-Id: I89bacfbf270d2d1bc1b9b2fa6951b355a67b808c

core/cxx_stl_setup.mk

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 630fe4e..c59cd34 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -50,8 +50,14 @@
     my_cflags += -D_USING_LIBCXX
     my_c_includes += external/libcxx/include
 
+    # Note that the structure of this means that LOCAL_CXX_STL := libc++ will
+    # use the static libc++ for static executables.
     ifeq ($(my_link_type),dynamic)
-        my_shared_libraries += libc++
+        ifeq ($(my_cxx_stl),libc++)
+            my_shared_libraries += libc++
+        else
+            my_static_libraries += libc++_static
+        endif
     else
         my_static_libraries += libc++_static
     endif