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

Commit 51fb7ac7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove support for gnustl."

parents 0b4bf51e 94f95cf5

core/allowed_ndk_types.mk

+0 −4
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ ifdef LOCAL_SDK_VERSION 
    else ifeq ($(LOCAL_NDK_STL_VARIANT),c++_static)

        my_ndk_stl_family := libc++

        my_ndk_stl_link_type := static

    else ifeq ($(LOCAL_NDK_STL_VARIANT),gnustl_static)

        my_ndk_stl_family := gnustl

        my_ndk_stl_link_type := static

    else ifeq ($(LOCAL_NDK_STL_VARIANT),stlport_shared)

        my_ndk_stl_family := stlport

        my_ndk_stl_link_type := shared
@@ -69,7 +66,6 @@ ifdef LOCAL_SDK_VERSION 
        # already been checked for consistency, and if they don't they'll be

        # kept isolated by RTLD_LOCAL anyway.

        my_allowed_ndk_types += \

            native:ndk:gnustl:static \

            native:ndk:libc++:shared native:ndk:libc++:static \

            native:ndk:stlport:shared native:ndk:stlport:static \

core/binary.mk

+1 −7
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ ifneq ($(LOCAL_SDK_VERSION),) 
  ifeq (,$(LOCAL_NDK_STL_VARIANT))

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

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

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

  endif

  ifeq (system,$(LOCAL_NDK_STL_VARIANT))
@@ -232,18 +232,12 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    my_ldlibs += -ldl



    my_ndk_cpp_std_version := c++11

  else # LOCAL_NDK_STL_VARIANT is not c++_* either

  ifneq (,$(filter gnustl_%, $(LOCAL_NDK_STL_VARIANT)))

    my_ndk_stl_include_path := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/libs/$(my_cpu_variant)/include \

                               $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/include

    my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/gnu-libstdc++/$($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_NDK_GCC_VERSION)/libs/$(my_cpu_variant)/libgnustl_static.a

  else # LOCAL_NDK_STL_VARIANT must be none

    # Do nothing.

  endif

  endif

  endif

endif

endif



ifneq ($(LOCAL_USE_VNDK),)

  my_cflags += -D__ANDROID_API__=__ANDROID_API_FUTURE__ -D__ANDROID_VNDK__

core/target_test_internal.mk

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ ifeq ($(LOCAL_GTEST),true) 
        my_ndk_gtest_suffix := _c++

    else ifneq ($(filter stlport_,$(LOCAL_NDK_STL_VARIANT)),)

        my_ndk_gtest_suffix := _stlport

    else ifneq ($(filter gnustl_,$(LOCAL_NDK_STL_VARIANT)),)

        my_ndk_gtest_suffix := _gnustl

    else # system STL, use stlport

        my_ndk_gtest_suffix := _stlport

    endif