diff options
| author | 2016-03-10 17:25:50 +0000 | |
|---|---|---|
| committer | 2016-03-10 17:30:25 +0000 | |
| commit | 07f6818ef68046d4749963b3bd59f7e93cf43fa9 (patch) | |
| tree | f92c036b6340bba99208ca2810f1453ed45d35d7 /compiler | |
| 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
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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) |