This reverts commit 7de79cbeaf
.
Fixed CTS build issue by adding -march=armv7-a in cts/tests/tests/os/jni/Android.mk since the library built here needs/uses instruction (swp) obsolete in ARMv8.
Bug: 64964151
Test: lunch aosp_arm64-userdebug; make -j cts
lunch aosp_x86-userdebug; make -j cts
lunch aosp_sailfish-userdebug; make -j cts
lunch aosp_bullhead-userdebug; make -j cts
Change-Id: Ic3a121600da8e2a9a2d5176b9680cd18ce457959
10 lines
388 B
Makefile
10 lines
388 B
Makefile
# Configuration for Linux on ARM.
|
|
# Generating binaries for the ARMv8-a architecture
|
|
#
|
|
# Many libraries are not aware of armv8-a, and AArch32 is (almost) a superset
|
|
# of armv7-a-neon. So just let them think we are just like v7.
|
|
ARCH_ARM_HAVE_ARMV7A := true
|
|
ARCH_ARM_HAVE_VFP := true
|
|
ARCH_ARM_HAVE_VFP_D32 := true
|
|
ARCH_ARM_HAVE_NEON := true
|