diff options
| author | 2016-03-10 17:25:50 +0000 | |
|---|---|---|
| committer | 2016-03-10 17:30:25 +0000 | |
| commit | 07f6818ef68046d4749963b3bd59f7e93cf43fa9 (patch) | |
| tree | f92c036b6340bba99208ca2810f1453ed45d35d7 | |
| parent | 8411aa3d88f4baf583ec4ecd62bb619cacd28acb (diff) | |
ART: Do not use vixld - workaround to fix dex2oatds.
This is a quick workaround for ODR violations caused
by linking libvixl.a compiled without VIXL_DEBUG with
the libartd-compiler.a compiled with VIXL_DEBUG.
Bug: 27588884
Change-Id: Ib1af165f177f125f03cdd99777dff4c2912f6405
| -rw-r--r-- | build/Android.common_build.mk | 1 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 4 | ||||
| -rw-r--r-- | compiler/Android.mk | 4 | ||||
| -rw-r--r-- | disassembler/Android.mk | 2 | ||||
| -rw-r--r-- | runtime/simulator/Android.mk | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 02bce411b4..fd84d05d2b 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -335,7 +335,6 @@ art_non_debug_cflags := \ art_debug_cflags := \ $(ART_DEBUG_OPT_FLAG) \ -DDYNAMIC_ANNOTATIONS_ENABLED=1 \ - -DVIXL_DEBUG \ -UNDEBUG art_host_non_debug_cflags := $(art_non_debug_cflags) diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index b3832ac3b6..fda4f5d534 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -573,7 +573,7 @@ define define-art-gtest ifeq ($$(art_target_or_host),target) $$(eval $$(call set-target-local-clang-vars)) $$(eval $$(call set-target-local-cflags-vars,debug)) - LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libz libcutils libvixld + LOCAL_SHARED_LIBRARIES += libdl libicuuc libicui18n libnativehelper libz libcutils libvixl LOCAL_MODULE_PATH_32 := $$(ART_TARGET_NATIVETEST_OUT)/$$(ART_TARGET_ARCH_32) LOCAL_MODULE_PATH_64 := $$(ART_TARGET_NATIVETEST_OUT)/$$(ART_TARGET_ARCH_64) LOCAL_MULTILIB := both @@ -611,7 +611,7 @@ test-art-target-gtest-$$(art_gtest_name): $$(ART_TEST_TARGET_GTEST_$$(art_gtest_ LOCAL_CLANG := $$(ART_HOST_CLANG) LOCAL_CFLAGS += $$(ART_HOST_CFLAGS) $$(ART_HOST_DEBUG_CFLAGS) LOCAL_ASFLAGS += $$(ART_HOST_ASFLAGS) - LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libziparchive-host libz-host libvixld + LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libziparchive-host libz-host libvixl LOCAL_LDLIBS := $(ART_HOST_LDLIBS) -lpthread -ldl LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := both diff --git a/compiler/Android.mk b/compiler/Android.mk index 7a257b649f..11ee6dd3a1 100644 --- a/compiler/Android.mk +++ b/compiler/Android.mk @@ -330,9 +330,9 @@ $$(ENUM_OPERATOR_OUT_GEN): $$(GENERATED_SRC_DIR)/%_operator_out.cc : $(LOCAL_PAT # Vixl assembly support for ARM64 targets. ifeq ($$(art_ndebug_or_debug),debug) ifeq ($$(art_static_or_shared), static) - LOCAL_WHOLESTATIC_LIBRARIES += libvixld + LOCAL_WHOLESTATIC_LIBRARIES += libvixl else - LOCAL_SHARED_LIBRARIES += libvixld + LOCAL_SHARED_LIBRARIES += libvixl endif else ifeq ($$(art_static_or_shared), static) diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 039986ce2b..bf563c7660 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -89,7 +89,7 @@ define build-libart-disassembler LOCAL_NATIVE_COVERAGE := $(ART_COVERAGE) # For disassembler_arm64. ifeq ($$(art_ndebug_or_debug),debug) - LOCAL_SHARED_LIBRARIES += libvixld + LOCAL_SHARED_LIBRARIES += libvixl else LOCAL_SHARED_LIBRARIES += libvixl endif diff --git a/runtime/simulator/Android.mk b/runtime/simulator/Android.mk index c154eb6346..5c71da6255 100644 --- a/runtime/simulator/Android.mk +++ b/runtime/simulator/Android.mk @@ -86,7 +86,7 @@ define build-libart-simulator LOCAL_NATIVE_COVERAGE := $(ART_COVERAGE) # For simulator_arm64. ifeq ($$(art_ndebug_or_debug),debug) - LOCAL_SHARED_LIBRARIES += libvixld + LOCAL_SHARED_LIBRARIES += libvixl else LOCAL_SHARED_LIBRARIES += libvixl endif |