Merge "Remove mips special case."

This commit is contained in:
Dan Albert
2016-04-05 18:51:16 +00:00
committed by Gerrit Code Review

View File

@@ -109,9 +109,6 @@ ifdef LOCAL_SDK_VERSION
my_ndk_stl_static_lib := my_ndk_stl_static_lib :=
my_ndk_stl_cppflags := my_ndk_stl_cppflags :=
my_cpu_variant := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI) my_cpu_variant := $(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)CPU_ABI)
ifeq (mips32r6,$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH_VARIANT))
my_cpu_variant := mips32r6
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 := system