diff options
| author | Dan Albert <danalbert@google.com> | 2015-08-15 03:42:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-15 03:42:11 +0000 |
| commit | 929d45bbdac9245b6516f033fb7ce4059a9067b8 (patch) | |
| tree | 2b9df2f1d0592d32e2f185d27c070ac5de011ec7 | |
| parent | 5100c0f3f529f9eba6ea43310abdbbf6bb84ac4d (diff) | |
| parent | e25abed5ef1542dc435905e05597fe374382fbec (diff) | |
| download | external_boringssl-929d45bbdac9245b6516f033fb7ce4059a9067b8.tar.gz external_boringssl-929d45bbdac9245b6516f033fb7ce4059a9067b8.tar.bz2 external_boringssl-929d45bbdac9245b6516f033fb7ce4059a9067b8.zip | |
am e25abed5: Fix and re-enable clang build.
* commit 'e25abed5ef1542dc435905e05597fe374382fbec':
Fix and re-enable clang build.
| -rw-r--r-- | Android.mk | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -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) |