commit 6168f5baf1111d9cc6ec3f27d23edc7c53ae3908
author Dan Albert <danalbert@google.com> Thu Dec 14 14:45:33 2017 -0800
committer Dan Albert <danalbert@google.com> Thu Dec 14 14:45:33 2017 -0800
tree 139c6fd2aa0fa95b3f1199ed0a4d809c5d4657f9
parent 973301af79c9f53467dc2baebc02aee02021469a

Default NDK modules to libc++_shared.

Test: make native
Bug: None
Change-Id: I9ca2313c2082e9841a20e240ffca84219a419d49

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 2f306b2..c468079 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -187,7 +187,7 @@
   endif
   LOCAL_NDK_STL_VARIANT := $(strip $(LOCAL_NDK_STL_VARIANT))
   ifeq (,$(LOCAL_NDK_STL_VARIANT))
-    LOCAL_NDK_STL_VARIANT := system
+    LOCAL_NDK_STL_VARIANT := c++_shared
   endif
   ifneq (1,$(words $(filter none system stlport_static stlport_shared c++_static c++_shared gnustl_static, $(LOCAL_NDK_STL_VARIANT))))
     $(error $(LOCAL_PATH): Unknown LOCAL_NDK_STL_VARIANT $(LOCAL_NDK_STL_VARIANT))