From 13204c36644625f117cc23bb9f2121b76653555f Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 14 Aug 2015 19:55:59 -0700 Subject: Disable clang build temporarily to fix build. The new clang doesn't like armv8-a+crypto, and it's not clear why yet. Disabling clang while we investigate. Change-Id: I255af7c7fd503ded43e8aeaf54a07f423f870aaa --- Android.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Android.mk b/Android.mk index 0315cfc..e432c7d 100644 --- a/Android.mk +++ b/Android.mk @@ -17,10 +17,11 @@ LOCAL_CFLAGS = -Wno-unused-parameter # sha256-armv4.S does not compile with clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as ifeq ($(TARGET_ARCH),arm64) -ifeq ($(USE_CLANG_PLATFORM_BUILD),true) -LOCAL_ASFLAGS += -march=armv8-a+crypto -endif +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 include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_STATIC_LIBRARY) @@ -35,10 +36,11 @@ LOCAL_SDK_VERSION := 9 # sha256-armv4.S does not compile with clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as ifeq ($(TARGET_ARCH),arm64) -ifeq ($(USE_CLANG_PLATFORM_BUILD),true) -LOCAL_ASFLAGS += -march=armv8-a+crypto -endif +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 include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_SHARED_LIBRARY) -- cgit v1.1