am 5100c0f3: (-s ours) am 13204c36: Disable clang build temporarily to fix build.
* commit '5100c0f3f529f9eba6ea43310abdbbf6bb84ac4d':
diff --git a/Android.mk b/Android.mk
index e432c7d..9487b30 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,12 +16,7 @@
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_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)