Replace final remnants of the old android_support.

It's over now, mister Frodo. Test: ./checkbuild.py && ./run_tests.py Bug: android/ndk#300 Change-Id: I708d8e4eca491488cc2bd7387fe2da90a45f2d8d
MIPS · Jul 13, 2017 · a7947cf · a7947cf
1 parent df9a4dd
commit a7947cf
Show file tree

Hide file tree

Showing 20 changed files with 138 additions and 5,016 deletions.
diff --git a/sources/android/support/Android.mk b/sources/android/support/Android.mk
@@ -122,14 +122,7 @@ android_support_sources := \
     src/posix_memalign.cpp \
     src/stdlib_support.cpp \
     src/swprintf.cpp \
-
-# These are old sources that should be purged/rewritten/taken from bionic.
-android_support_sources += \
-    src/wcstox/floatscan.c \
-    src/wcstox/intscan.c \
-    src/wcstox/shgetc.c \
-    src/wcstox/wcstod.c \
-    src/wcstox/wcstol.c \
+    src/wcstox.cpp \
 
 ifneq (armeabi,$(TARGET_ARCH_ABI))
 # The file uses instructions that aren't available in arm5.
@@ -159,19 +152,6 @@ LOCAL_CPPFLAGS := \
     -fvisibility-inlines-hidden \
     -std=c++11 \
 
-# These Clang warnings are triggered by the Musl sources. The code is fine,
-# but we don't want to modify it. TODO(digit): This is potentially dangerous,
-# see if there is a way to build the Musl sources in a separate static library
-# and have the main one depend on it, or include its object files.
-ifneq ($(TARGET_TOOLCHAIN),$(subst clang,,$(TARGET_TOOLCHAIN)))
-LOCAL_CFLAGS += \
-  -Wno-shift-op-parentheses \
-  -Wno-string-plus-int \
-  -Wno-dangling-else \
-  -Wno-bitwise-op-parentheses \
-  -Wno-shift-negative-value
-endif
-
 LOCAL_EXPORT_C_INCLUDES := $(android_support_export_c_includes)
 
 include $(BUILD_STATIC_LIBRARY)

diff --git a/sources/android/support/src/stdio/amd64/_fpmath.h b/sources/android/support/src/stdio/amd64/_fpmath.h
diff --git a/sources/android/support/src/stdio/arm/_fpmath.h b/sources/android/support/src/stdio/arm/_fpmath.h
diff --git a/sources/android/support/src/stdio/arm64/_fpmath.h b/sources/android/support/src/stdio/arm64/_fpmath.h
diff --git a/sources/android/support/src/stdio/i386/_fpmath.h b/sources/android/support/src/stdio/i386/_fpmath.h
diff --git a/sources/android/support/src/stdio/mips/_fpmath.h b/sources/android/support/src/stdio/mips/_fpmath.h