Merge "Revert "Default NDK modules to libc++_shared."" am: aec47c67cd

am: 041ea591ae

Change-Id: I62e2cdbe3d88a60898140700e410f11592c48415
This commit is contained in:
Dan Albert 2017-12-15 21:51:39 +00:00 committed by android-build-merger
commit b86ff3828a

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 := c++_shared
LOCAL_NDK_STL_VARIANT := system
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))