summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-03-31 22:34:56 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-03-31 22:34:56 +0000
commit2fd58737987874cb4fea1c108abb210bb1d4380e (patch)
tree3842f18996681b05dad4b8a9104d5746c6dc8054
parentb3fa2e210e7d170015bebeea5f91be358e87ef33 (diff)
parent389be4a79c808d57dfe481d654564de0497479be (diff)
downloadlibcxxabi-ndk-release-r21.tar.gz
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-r21ndk-r21endk-r21dndk-r21cndk-r21bsnap-temp-L24000000600201335ndk-release-r21
Change-Id: I058f0bca6cba6cbf9c4399eca2cdc62206e24193
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index c9d79cb..1788847 100644
--- a/Android.mk
+++ b/Android.mk
@@ -79,6 +79,7 @@ LOCAL_C_INCLUDES := $(libcxxabi_includes)
LOCAL_CPPFLAGS := $(libcxxabi_cppflags)
LOCAL_CPP_FEATURES := rtti exceptions
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+LOCAL_ARM_NEON := false
ifeq ($(NDK_PLATFORM_NEEDS_ANDROID_SUPPORT),true)
# This doesn't affect the prebuilt itself since this is a prebuilt library,