Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6168f5ba authored by Dan Albert's avatar Dan Albert
Browse files

Default NDK modules to libc++_shared. 

Test: make native
Bug: None
Change-Id: I9ca2313c2082e9841a20e240ffca84219a419d49
parent 973301af

core/binary.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -187,7 +187,7 @@ ifneq ($(LOCAL_SDK_VERSION),) 
  endif

  endif

  LOCAL_NDK_STL_VARIANT := $(strip $(LOCAL_NDK_STL_VARIANT))

  LOCAL_NDK_STL_VARIANT := $(strip $(LOCAL_NDK_STL_VARIANT))

  ifeq (,$(LOCAL_NDK_STL_VARIANT))

  ifeq (,$(LOCAL_NDK_STL_VARIANT))

    LOCAL_NDK_STL_VARIANT := system

    LOCAL_NDK_STL_VARIANT := c++_shared

  endif

  endif

  ifneq (1,$(words $(filter none system stlport_static stlport_shared c++_static c++_shared gnustl_static, $(LOCAL_NDK_STL_VARIANT))))

  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))

    $(error $(LOCAL_PATH): Unknown LOCAL_NDK_STL_VARIANT $(LOCAL_NDK_STL_VARIANT))