Merge "Remove mips special case." am: a6a6285

am: 7d4c8fe

* commit '7d4c8fefec0998048b34fcedc4f1c893e00919eb':
  Remove mips special case.

Change-Id: Ia55997b8dc087129e39028cd16fb9f3c49b950c0
This commit is contained in:
Dan Albert
2016-04-05 19:00:42 +00:00
committed by android-build-merger

View File

@@ -109,9 +109,6 @@ ifdef LOCAL_SDK_VERSION
my_ndk_stl_static_lib :=
my_ndk_stl_cppflags :=
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))
ifeq (,$(LOCAL_NDK_STL_VARIANT))
LOCAL_NDK_STL_VARIANT := system