diff options
| author | Dan Albert <danalbert@google.com> | 2015-08-15 03:14:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-15 03:14:41 +0000 |
| commit | 5100c0f3f529f9eba6ea43310abdbbf6bb84ac4d (patch) | |
| tree | a8ff52a29d83e3247d1a7701ca445721fb23c01d | |
| parent | 3b2c60656d36f47063e972b9aa2c11ef235253a6 (diff) | |
| parent | 13204c36644625f117cc23bb9f2121b76653555f (diff) | |
| download | external_boringssl-5100c0f3f529f9eba6ea43310abdbbf6bb84ac4d.zip external_boringssl-5100c0f3f529f9eba6ea43310abdbbf6bb84ac4d.tar.gz external_boringssl-5100c0f3f529f9eba6ea43310abdbbf6bb84ac4d.tar.bz2 | |
am 13204c36: Disable clang build temporarily to fix build.
* commit '13204c36644625f117cc23bb9f2121b76653555f':
Disable clang build temporarily to fix build.
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -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) |