diff options
| author | Dan Albert <danalbert@google.com> | 2020-03-09 13:46:28 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2020-03-09 14:41:40 -0700 |
| commit | 38f9a22bc3ffc5e9e09ec7277ce32942b101254a (patch) | |
| tree | 3a2c5fded7f3037bf3a815b43be76757c2fe67a9 | |
| parent | d220fe922b5869c1b153167a78dc8f081b891dae (diff) | |
| download | ndk-38f9a22bc3ffc5e9e09ec7277ce32942b101254a.tar.gz | |
Build device prebuilts without Neon.
Test: readelf -A
Bug: https://github.com/android/ndk/issues/1203
Change-Id: If7081925d7923a3f6085ee2e060b26696e756e71
| -rw-r--r-- | docs/changelogs/Changelog-r21.md | 2 | ||||
| -rwxr-xr-x | ndk/checkbuild.py | 3 | ||||
| -rw-r--r-- | sources/android/support/Android.mk | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/docs/changelogs/Changelog-r21.md b/docs/changelogs/Changelog-r21.md index 69e6b2221..05a56655a 100644 --- a/docs/changelogs/Changelog-r21.md +++ b/docs/changelogs/Changelog-r21.md @@ -64,9 +64,11 @@ For Android Studio issues, follow the docs on the [Android Studio site]. * [Issue 1166]: Rehid unwinder symbols all architectures. * [Issue 1201]: Fixed issue in ndk-build that was causing `APP_PLATFORM` to be corrupted for API 30+ with LP64 ABIs. + * [Issue 1203]: libc++ prebuilts and CRT objects are no longer built as Neon. [Issue 1166]: https://github.com/android/ndk/issues/1166 [Issue 1201]: https://github.com/android/ndk/issues/1201 +[Issue 1203]: https://github.com/android/ndk/issues/1203 ## Changes diff --git a/ndk/checkbuild.py b/ndk/checkbuild.py index 5e6cf7a76..72f1a3f18 100755 --- a/ndk/checkbuild.py +++ b/ndk/checkbuild.py @@ -925,6 +925,9 @@ class Platforms(ndk.builds.Module): dst, ] + srcs + if arch == ndk.abis.Arch('arm'): + args.append('-mfpu=vfpv3-d16') + return args def check_elf_note(self, obj_file: str) -> None: diff --git a/sources/android/support/Android.mk b/sources/android/support/Android.mk index d4728a59c..c9a908f0a 100644 --- a/sources/android/support/Android.mk +++ b/sources/android/support/Android.mk @@ -118,6 +118,7 @@ LOCAL_MODULE := android_support LOCAL_SRC_FILES := $(android_support_sources) LOCAL_C_INCLUDES := $(android_support_c_includes) LOCAL_CFLAGS := $(android_support_cflags) +LOCAL_ARM_NEON := false LOCAL_CPPFLAGS := \ -fvisibility-inlines-hidden \ |