diff options
| -rw-r--r-- | build/Android.executable.mk | 2 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 4 | ||||
| -rw-r--r-- | build/Android.libarttest.mk | 4 | ||||
| -rw-r--r-- | compiler/Android.mk | 4 | ||||
| -rw-r--r-- | compiler/output_stream.h | 2 | ||||
| -rw-r--r-- | dalvikvm/Android.mk | 1 | ||||
| -rw-r--r-- | disassembler/Android.mk | 2 | ||||
| -rw-r--r-- | runtime/Android.mk | 8 |
8 files changed, 12 insertions, 15 deletions
diff --git a/build/Android.executable.mk b/build/Android.executable.mk index 3c33975a4d..a186e8511f 100644 --- a/build/Android.executable.mk +++ b/build/Android.executable.mk @@ -99,8 +99,8 @@ define build-art-executable LOCAL_MULTILIB := $$(art_multilib) endif + include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) - include external/libcxx/libcxx.mk include $(BUILD_EXECUTABLE) ART_TARGET_EXECUTABLES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_EXECUTABLES)/$$(LOCAL_MODULE) else # host diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 952f79a489..765216b005 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -182,6 +182,7 @@ define build-art-test endif LOCAL_CFLAGS := $(ART_TEST_CFLAGS) + include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) LOCAL_CLANG := $(ART_TARGET_CLANG) LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS) @@ -191,7 +192,6 @@ define build-art-test LOCAL_MODULE_PATH_32 := $(ART_NATIVETEST_OUT)/$(ART_TARGET_ARCH_32) LOCAL_MODULE_PATH_64 := $(ART_NATIVETEST_OUT)/$(ART_TARGET_ARCH_64) LOCAL_MULTILIB := both - include external/libcxx/libcxx.mk include $(BUILD_EXECUTABLE) ART_TARGET_GTEST_EXECUTABLES$(ART_PHONY_TEST_TARGET_SUFFIX) += $(ART_NATIVETEST_OUT)/$(TARGET_ARCH)/$$(LOCAL_MODULE) @@ -216,7 +216,7 @@ $$(art_gtest_target): $$(art_gtest_target)$(ART_PHONY_TEST_TARGET_SUFFIX) LOCAL_STATIC_LIBRARIES += libcutils libvixl ifneq ($(WITHOUT_HOST_CLANG),true) # GCC host compiled tests fail with this linked, presumably due to destructors that run. - LOCAL_STATIC_LIBRARIES += libgtest_host + LOCAL_STATIC_LIBRARIES += libgtest_libc++_host endif LOCAL_LDLIBS += -lpthread -ldl LOCAL_IS_HOST_MODULE := true diff --git a/build/Android.libarttest.mk b/build/Android.libarttest.mk index 696532684e..9e5f3d6e4e 100644 --- a/build/Android.libarttest.mk +++ b/build/Android.libarttest.mk @@ -46,6 +46,7 @@ define build-libarttest LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/build/Android.common.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/build/Android.libarttest.mk + include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) LOCAL_CLANG := $(ART_TARGET_CLANG) LOCAL_CFLAGS := $(ART_TARGET_CFLAGS) $(ART_TARGET_DEBUG_CFLAGS) @@ -56,13 +57,12 @@ define build-libarttest LOCAL_MODULE_PATH_32 := $(ART_TEST_OUT)/$(ART_TARGET_ARCH_32) LOCAL_MODULE_PATH_64 := $(ART_TEST_OUT)/$(ART_TARGET_ARCH_64) LOCAL_MODULE_TARGET_ARCH := $(ART_SUPPORTED_ARCH) - include external/libcxx/libcxx.mk include $(BUILD_SHARED_LIBRARY) else # host LOCAL_CLANG := $(ART_HOST_CLANG) LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS) LOCAL_STATIC_LIBRARIES := libcutils - LOCAL_LDLIBS := -ldl -lpthread + LOCAL_LDLIBS += -ldl -lpthread ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt endif diff --git a/compiler/Android.mk b/compiler/Android.mk index 4108ba463d..cb9e41a4fb 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -194,8 +194,8 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT LOCAL_GENERATED_SOURCES += $$(ENUM_OPERATOR_OUT_GEN) LOCAL_CFLAGS := $$(LIBART_COMPILER_CFLAGS) + include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) - include external/libcxx/libcxx.mk LOCAL_CLANG := $(ART_TARGET_CLANG) LOCAL_CFLAGS += $(ART_TARGET_CFLAGS) else # host @@ -247,7 +247,7 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT LOCAL_C_INCLUDES += $(ART_C_INCLUDES) art/runtime ifeq ($$(art_target_or_host),host) - LOCAL_LDLIBS := -ldl -lpthread + LOCAL_LDLIBS += -ldl -lpthread endif LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk diff --git a/compiler/output_stream.h b/compiler/output_stream.h index 478a854f26..b5ac9331cd 100644 --- a/compiler/output_stream.h +++ b/compiler/output_stream.h @@ -18,8 +18,8 @@ #define ART_COMPILER_OUTPUT_STREAM_H_ #include <stdint.h> - #include <string> +#include <sys/types.h> #include "base/macros.h" diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 0ded2d8b10..03d32f01bc 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -51,6 +51,7 @@ LOCAL_SHARED_LIBRARIES := libnativehelper LOCAL_LDFLAGS := -ldl -lpthread LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_IS_HOST_MODULE := true +include external/libcxx/libcxx.mk include $(BUILD_HOST_EXECUTABLE) ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE) endif diff --git a/disassembler/Android.mk b/disassembler/Android.mk index dd4e9d5de7..814323cda2 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -87,8 +87,8 @@ define build-libart-disassembler LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common.mk LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk + include external/libcxx/libcxx.mk ifeq ($$(art_target_or_host),target) - include external/libcxx/libcxx.mk LOCAL_SHARED_LIBRARIES += libcutils libvixl include $(BUILD_SHARED_LIBRARY) else # host diff --git a/runtime/Android.mk b/runtime/Android.mk index 1521caa05f..296cec902f 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -397,12 +397,8 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT endif LOCAL_C_INCLUDES += $(ART_C_INCLUDES) LOCAL_SHARED_LIBRARIES += liblog libnativehelper - ifeq ($$(art_target_or_host),target) - include external/libcxx/libcxx.mk - LOCAL_SHARED_LIBRARIES += libbacktrace_libc++ - else - LOCAL_SHARED_LIBRARIES += libbacktrace - endif + include external/libcxx/libcxx.mk + LOCAL_SHARED_LIBRARIES += libbacktrace_libc++ ifeq ($$(art_target_or_host),target) LOCAL_SHARED_LIBRARIES += libcutils libdl libselinux libutils LOCAL_STATIC_LIBRARIES := libziparchive libz |