Merge "Default NDK modules to libc++_shared." am: 587ced4a80

am: 1316e40597

Change-Id: Ibb40392071cfba45b1a20b07c73762111841a77d
This commit is contained in:
Dan Albert 2017-12-15 02:39:12 +00:00 committed by android-build-merger
commit 9bd305948d

View file

@ -187,7 +187,7 @@ ifneq ($(LOCAL_SDK_VERSION),)
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))