commit 1dc6676dba152ac2a37ebd2610026452c1bda588
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue Mar 31 22:36:30 2020 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Tue Mar 31 22:36:30 2020 +0000
tree 69dfbb2e0241d34fa5aca4fe96abe7c08900e4f1
parent 824aaa36e08b25a648562dc8ba0b2797d85a5153
parent 0199b8d751d43258de1ee700566525fc9cff488b

Merge cherrypicks of [1275206, 1275207, 1275375, 1275579, 1275580, 1275581, 1275582, 1275583, 1275584, 1275585, 1275586, 1275587, 1275588, 1275589, 1275398, 1275399, 1275223, 1275540, 1275541, 1275542, 1275435] into ndk-release-r21

Change-Id: Ia411f372ab9fcbc40a42b038c2090508ca1e88f0

Android.mk

diff --git a/Android.mk b/Android.mk
index b684518..532d495 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,6 +54,7 @@
 LOCAL_CFLAGS := -D__STDC_FORMAT_MACROS
 LOCAL_CPPFLAGS := -std=c++11
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_ARM_NEON := false
 
 ifeq ($(NDK_PLATFORM_NEEDS_ANDROID_SUPPORT),true)
     LOCAL_STATIC_LIBRARIES := android_support