Stop using libandroid_support.

Not needed now that we no longer support kitkat.

Bug: android/ndk#1751
Test: treehugger
Change-Id: If85a6532f4c7c23b4e354efdef76e94c09e9be56

libcxx/Android.mk

@@ -97,17 +97,7 @@ LOCAL_EXPORT_C_INCLUDES := $(libcxx_export_includes)
 LOCAL_STATIC_LIBRARIES := libc++abi
 LOCAL_EXPORT_CPPFLAGS := $(libcxx_export_cxxflags)
 LOCAL_EXPORT_LDFLAGS := $(libcxx_export_ldflags)
-LOCAL_EXPORT_STATIC_LIBRARIES := libc++abi
-
-ifeq ($(NDK_PLATFORM_NEEDS_ANDROID_SUPPORT),true)
-    # This doesn't affect the prebuilt itself since this is a prebuilt library,
-    # but the build system needs to know about the dependency so we can sort the
-    # exported includes properly.
-    LOCAL_STATIC_LIBRARIES += libandroid_support
-    LOCAL_EXPORT_STATIC_LIBRARIES += libandroid_support
-endif
-
-LOCAL_EXPORT_STATIC_LIBRARIES += libunwind
+LOCAL_EXPORT_STATIC_LIBRARIES := libc++abi libunwind
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -119,15 +109,6 @@ LOCAL_EXPORT_C_INCLUDES := \
 
 LOCAL_EXPORT_CPPFLAGS := $(libcxx_export_cxxflags)
 LOCAL_EXPORT_LDFLAGS := $(libcxx_export_ldflags)
-
-ifeq ($(NDK_PLATFORM_NEEDS_ANDROID_SUPPORT),true)
-    # This doesn't affect the prebuilt itself since this is a prebuilt library,
-    # but the build system needs to know about the dependency so we can sort the
-    # exported includes properly.
-    LOCAL_STATIC_LIBRARIES := libandroid_support
-    LOCAL_EXPORT_STATIC_LIBRARIES := libandroid_support
-endif
-
 LOCAL_EXPORT_STATIC_LIBRARIES += libunwind
 include $(PREBUILT_SHARED_LIBRARY)
 
@@ -149,10 +130,6 @@ LOCAL_EXPORT_CPPFLAGS := $(libcxx_export_cxxflags)
 LOCAL_EXPORT_LDFLAGS := $(libcxx_export_ldflags)
 LOCAL_STATIC_LIBRARIES := libc++abi
 
-ifeq ($(NDK_PLATFORM_NEEDS_ANDROID_SUPPORT),true)
-    LOCAL_STATIC_LIBRARIES += android_support
-endif
-
 LOCAL_STATIC_LIBRARIES += libunwind
 LOCAL_EXPORT_STATIC_LIBRARIES += libunwind
 include $(BUILD_STATIC_LIBRARY)
@@ -168,9 +145,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libc++abi
 LOCAL_EXPORT_C_INCLUDES := $(libcxx_export_includes)
 LOCAL_EXPORT_CPPFLAGS := $(libcxx_export_cxxflags)
 LOCAL_EXPORT_LDFLAGS := $(libcxx_export_ldflags)
-ifeq ($(NDK_PLATFORM_NEEDS_ANDROID_SUPPORT),true)
-    LOCAL_STATIC_LIBRARIES := android_support
-endif
 LOCAL_LDFLAGS := $(libcxx_ldflags)
 # Use --as-needed to strip the DT_NEEDED on libstdc++.so (bionic's) that the
 # driver always links for C++ but we don't use.
@@ -189,5 +163,3 @@ $(call import-add-path, $(LOCAL_PATH)/../../..)
 $(call import-module, toolchain/llvm-project/libcxxabi)
 
 endif # LIBCXX_FORCE_REBUILD == true
-
-$(call import-module, android/support)

libcxxabi/Android.mk

@@ -91,5 +91,3 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libunwind
 LOCAL_SRC_FILES := $(NDK_TOOLCHAIN_LIB_DIR)/$(TARGET_TOOLCHAIN_ARCH_LIB_DIR)/libunwind.a
 include $(PREBUILT_STATIC_LIBRARY)
-
-$(call import-module, android/support)