summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-08-14 20:11:19 -0700
committerDan Albert <danalbert@google.com>2015-08-14 20:12:17 -0700
commite25abed5ef1542dc435905e05597fe374382fbec (patch)
tree2b9df2f1d0592d32e2f185d27c070ac5de011ec7
parent13204c36644625f117cc23bb9f2121b76653555f (diff)
downloadexternal_boringssl-e25abed5ef1542dc435905e05597fe374382fbec.tar.gz
external_boringssl-e25abed5ef1542dc435905e05597fe374382fbec.tar.bz2
external_boringssl-e25abed5ef1542dc435905e05597fe374382fbec.zip
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
-rw-r--r--Android.mk14
1 files 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)