summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-08-15 03:16:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-15 03:16:27 +0000
commit6fdd065a7c3295f6d836655ab5f9229dc1183ec5 (patch)
treea8ff52a29d83e3247d1a7701ca445721fb23c01d
parentdc35386c92b2c545de07d711009d3e8f7e25db00 (diff)
parent13204c36644625f117cc23bb9f2121b76653555f (diff)
downloadexternal_boringssl-6fdd065a7c3295f6d836655ab5f9229dc1183ec5.tar.gz
external_boringssl-6fdd065a7c3295f6d836655ab5f9229dc1183ec5.tar.bz2
external_boringssl-6fdd065a7c3295f6d836655ab5f9229dc1183ec5.zip
am 13204c36: Disable clang build temporarily to fix build.
* commit '13204c36644625f117cc23bb9f2121b76653555f': Disable clang build temporarily to fix build.
-rw-r--r--Android.mk14
1 files 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)