Revert Android -mfpu=vfpv4

build/android/Makefile

@@ -29,7 +29,7 @@ VERSION_PATCH := $(shell cat $(PROJ_ROOT)/CMakeLists.txt | \
 TARGET_HOST = arm-linux
 TARGET_ABI = armeabi-v7a
 TARGET_TOOLCHAIN = arm-linux-androideabi
-TARGET_CFLAGS_ADDON = -mfpu=vfpv4 -march=armv7-a -Ofast -fdata-sections -ffunction-sections -fvisibility=hidden -flto -D__ANDROID_API__=$(API)
+TARGET_CFLAGS_ADDON = -mfpu=vfpv3-d16 -march=armv7-a -Ofast -fdata-sections -ffunction-sections -fvisibility=hidden -flto -D__ANDROID_API__=$(API)
 TARGET_CXXFLAGS_ADDON = $(TARGET_CFLAGS_ADDON)
 TARGET_LDFLAGS_ADDON = -Wl,--no-warn-mismatch,--gc-sections,--icf=safe
 CROSS_PREFIX = arm-linux-androideabi
@@ -77,7 +77,7 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)/timestamp
 IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp
 IRRLICHT_URL_HTTP = https://github.com/zaki/irrlicht/archive/$(IRRLICHT_COMMIT).zip
 
-CURL_VERSION = 7.59.0
+CURL_VERSION = 7.60.0
 CURL_DIR = $(ANDR_ROOT)/deps/curl
 CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
 CURL_TIMESTAMP = $(CURL_DIR)/timestamp

build/android/jni/Android.mk

@@ -61,7 +61,7 @@ else
 
 ifeq ($(TARGET_ABI),armeabi-v7a)
 LOCAL_CFLAGS += \
--mfpu=vfpv4 -march=armv7-a -Ofast \
+-mfpu=vfpv3-d16 -march=armv7-a -Ofast \
 -fdata-sections -ffunction-sections -fvisibility=hidden -flto
 LOCAL_CXXFLAGS += $(LOCAL_CFLAGS)
 LOCAL_LDFLAGS = -Wl,--no-warn-mismatch,--gc-sections,--icf=safe

build/android/patches/irrlicht-optimization.patch

@@ -6,7 +6,7 @@
  else
 -LOCAL_CFLAGS += -fexpensive-optimizations -O3
 +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-+LOCAL_CFLAGS    += -mfpu=vfpv4 -march=armv7-a -Ofast -fdata-sections -ffunction-sections -fvisibility=hidden -flto
++LOCAL_CFLAGS    += -mfpu=vfpv3-d16 -march=armv7-a -Ofast -fdata-sections -ffunction-sections -fvisibility=hidden -flto
 +LOCAL_CXXFLAGS += $(LOCAL_CFLAGS)
 +LOCAL_LDFLAGS   += -Wl,--no-warn-mismatch,--gc-sections,--icf=safe
 +endif