diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-03-31 22:34:58 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-03-31 22:34:58 +0000 |
| commit | d73f343ced577c0f2f7c0380c01e7b52c7665e29 (patch) | |
| tree | e8ef00039105fa37263b1a226d4e8968f180a833 | |
| parent | b34f6003c407e0c91d08e5c4aacd07a32d3f03fa (diff) | |
| parent | eac1f7fef86a25165487db4a0280457fd358d971 (diff) | |
| download | external_libcxx-d73f343ced577c0f2f7c0380c01e7b52c7665e29.tar.gz external_libcxx-d73f343ced577c0f2f7c0380c01e7b52c7665e29.tar.bz2 external_libcxx-d73f343ced577c0f2f7c0380c01e7b52c7665e29.zip | |
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-r21dndk-r21cndk-r21b
Change-Id: I193e3ed92c74a3a730b44490b43a583ff93dc5d3
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index af0fb3bb1..5bccc7439 100644 --- a/Android.mk +++ b/Android.mk @@ -160,6 +160,7 @@ LOCAL_EXPORT_C_INCLUDES := $(libcxx_export_includes) LOCAL_EXPORT_CPPFLAGS := $(libcxx_export_cxxflags) LOCAL_EXPORT_LDFLAGS := $(libcxx_export_ldflags) LOCAL_STATIC_LIBRARIES := libc++abi +LOCAL_ARM_NEON := false ifeq ($(NDK_PLATFORM_NEEDS_ANDROID_SUPPORT),true) LOCAL_STATIC_LIBRARIES += android_support @@ -192,6 +193,7 @@ LOCAL_LDFLAGS := $(libcxx_ldflags) # driver always links for C++ but we don't use. # See https://github.com/android-ndk/ndk/issues/105 LOCAL_LDFLAGS += -Wl,--as-needed +LOCAL_ARM_NEON := false # We use the LLVM unwinder for all the 32-bit ARM targets. ifneq (,$(filter armeabi%,$(TARGET_ARCH_ABI))) |