From 94f95cf504924eae77f6e0d2636f2dffb28cf7e5 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Wed, 20 Dec 2017 15:53:26 -0800
Subject: [PATCH] Remove support for gnustl.

Test: make checkbuild
Bug: None
Change-Id: Iaddd40b32f84395a76efaaa74be38770085617d5
---
 core/allowed_ndk_types.mk    | 4 ----
 core/binary.mk               | 8 +-------
 core/target_test_internal.mk | 2 --
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/core/allowed_ndk_types.mk b/core/allowed_ndk_types.mk
index 643933a69..b5a85ca10 100644
--- a/core/allowed_ndk_types.mk
+++ b/core/allowed_ndk_types.mk
@@ -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 \
 
diff --git a/core/binary.mk b/core/binary.mk
index 27a8ab2e5..06b0d0ea8 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -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,17 +232,11 @@ 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),)
diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 59a3a9e05..d84d3d917 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -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