diff options
| -rw-r--r-- | build/Android.common_build.mk | 11 | ||||
| -rw-r--r-- | sigchainlib/Android.mk | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 0d3b4c9daa..1e074305d3 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -83,9 +83,18 @@ ART_TARGET_CLANG := $(USE_CLANG_PLATFORM_BUILD) else ART_TARGET_CLANG := false endif + +ifeq ($(TARGET_ARCH),mips) + # b/18807290, Clang generated mips assembly code for array.cc + # cannot be compiled by gas. + # b/18789639, Clang assembler cannot compile inlined assembly code in + # valgrind_malloc_space-inl.h:192:5: error: used $at without ".set noat" + $(warning Clang is disabled for the mips target) +endif ART_TARGET_CLANG_arm := ART_TARGET_CLANG_arm64 := -ART_TARGET_CLANG_mips := +# TODO: Enable clang mips when b/18807290 and b/18789639 are fixed. +ART_TARGET_CLANG_mips := false ART_TARGET_CLANG_x86 := ART_TARGET_CLANG_x86_64 := diff --git a/sigchainlib/Android.mk b/sigchainlib/Android.mk index b7ff3606fd..35dec4b340 100644 --- a/sigchainlib/Android.mk +++ b/sigchainlib/Android.mk @@ -28,6 +28,7 @@ LOCAL_MODULE:= libsigchain LOCAL_SHARED_LIBRARIES := liblog LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common_build.mk +$(eval $(call set-target-local-clang-vars)) include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -40,6 +41,7 @@ LOCAL_MODULE:= libsigchain LOCAL_SHARED_LIBRARIES := liblog LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common_build.mk +$(eval $(call set-target-local-clang-vars)) include $(BUILD_STATIC_LIBRARY) # Build host library. |