diff options
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/Android.mk | 4 | ||||
| -rw-r--r-- | disassembler/disassembler_arm64.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 778fe8ee96..db327fcdb6 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -90,9 +90,9 @@ define build-libart-disassembler LOCAL_NATIVE_COVERAGE := $(ART_COVERAGE) # For disassembler_arm64. ifeq ($$(art_ndebug_or_debug),debug) - LOCAL_SHARED_LIBRARIES += libvixl-arm64 + LOCAL_SHARED_LIBRARIES += libvixld-arm64 else - LOCAL_SHARED_LIBRARIES += libvixl-arm64 + LOCAL_SHARED_LIBRARIES += libvixl-arm64 endif ifeq ($$(art_target_or_host),target) include $(BUILD_SHARED_LIBRARY) diff --git a/disassembler/disassembler_arm64.h b/disassembler/disassembler_arm64.h index c64d8eaf9d..7c64792b13 100644 --- a/disassembler/disassembler_arm64.h +++ b/disassembler/disassembler_arm64.h @@ -19,10 +19,11 @@ #include "disassembler.h" +// TODO(VIXL): Make VIXL compile with -Wshadow. #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wshadow" -#include "a64/decoder-a64.h" -#include "a64/disasm-a64.h" +#include "aarch64/decoder-aarch64.h" +#include "aarch64/disasm-aarch64.h" #pragma GCC diagnostic pop namespace art { |