From e25abed5ef1542dc435905e05597fe374382fbec Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 14 Aug 2015 20:11:19 -0700 Subject: Fix and re-enable clang build. TARGET_ARCH will be arm64 even when building the 32-bit code for an aarch64 target. Properly restrict the use of the armv8-a+crypto flag. Change-Id: Ica762d0ee22f35638a052afb2c904d49e2d08653 --- Android.mk | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Android.mk b/Android.mk index e432c7d..9487b30 100644 --- a/Android.mk +++ b/Android.mk @@ -16,12 +16,7 @@ LOCAL_SDK_VERSION := 9 LOCAL_CFLAGS = -Wno-unused-parameter # sha256-armv4.S does not compile with clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as -ifeq ($(TARGET_ARCH),arm64) -LOCAL_CLANG_ASFLAGS += -march=armv8-a+crypto -endif -# TODO(danalbert): Fix this, just disabling while we investigate the build -# break from armv8-a+crypto. -LOCAL_CLANG := false +LOCAL_CLANG_ASFLAGS_arm64 += -march=armv8-a+crypto include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_STATIC_LIBRARY) @@ -35,12 +30,7 @@ LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLE LOCAL_SDK_VERSION := 9 # sha256-armv4.S does not compile with clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as -ifeq ($(TARGET_ARCH),arm64) -LOCAL_CLANG_ASFLAGS += -march=armv8-a+crypto -endif -# TODO(danalbert): Fix this, just disabling while we investigate the build -# break from armv8-a+crypto. -LOCAL_CLANG := false +LOCAL_CLANG_ASFLAGS_arm64 += -march=armv8-a+crypto include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_SHARED_LIBRARY) -- cgit v1.1