From 37099686c0b054ff804a8461ee45de4d88c3a0d0 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 15 Dec 2017 20:01:03 +0000 Subject: [PATCH] Revert "Default NDK modules to libc++_shared." This reverts commit 6168f5baf1111d9cc6ec3f27d23edc7c53ae3908. Reason for revert: http://b/70718590 Change-Id: I3e7afe3d1642260c2b5103cb07c636b0b5d72379 --- core/binary.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/binary.mk b/core/binary.mk index c4680799b7..2f306b2c3c 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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))