From b48b9eb6d181a1f52e2e605cf26a21505f1d46ed Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Fri, 28 Feb 2014 16:20:21 -0800 Subject: Fix clang to compile and run host tests. Don't use the computed goto interpreter with clang 3.4 as it causes compilation to hang. Avoid inclusion of LLVM_(HOST|DEVICE)_BUILD_MK except for with portable as it sets clang incompatible cflags. Most fixes are self-evident, for the quick dex file method inliner the enums were being used with ostreams, so fix the enums and operator out python script to allow this. Note this change effects portable but this is untestable as portable was broken by ELF file and mc linker changes. Change-Id: Ia54348f6b1bd3f76d3b71c6e8c5f97626386b903 --- disassembler/Android.mk | 4 ---- 1 file changed, 4 deletions(-) (limited to 'disassembler') diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 1ce7b13..ca08b09 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -90,13 +90,9 @@ define build-libart-disassembler LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk ifeq ($$(art_target_or_host),target) LOCAL_SHARED_LIBRARIES += libcutils - include $(LLVM_GEN_INTRINSICS_MK) - include $(LLVM_DEVICE_BUILD_MK) include $(BUILD_SHARED_LIBRARY) else # host LOCAL_STATIC_LIBRARIES += libcutils - include $(LLVM_GEN_INTRINSICS_MK) - include $(LLVM_HOST_BUILD_MK) include $(BUILD_HOST_SHARED_LIBRARY) endif endef -- cgit v1.1