diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-17 10:22:02 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-11-17 10:22:02 +0000 |
| commit | 847c8db052fcb3c1a945a8206547c409d3eb06fc (patch) | |
| tree | 013b7081bf3805b25970dcd71ee18b79944fcab5 /disassembler | |
| parent | 195c576fbff290d4c313b67ed24ca36f2531acc4 (diff) | |
| download | art-847c8db052fcb3c1a945a8206547c409d3eb06fc.zip art-847c8db052fcb3c1a945a8206547c409d3eb06fc.tar.gz art-847c8db052fcb3c1a945a8206547c409d3eb06fc.tar.bz2 | |
Revert "Arm64: Use the debug version of VIXL for debug builds."
This reverts commit 195c576fbff290d4c313b67ed24ca36f2531acc4.
Change-Id: Id992a43ae346bb4c38a6c47639b02aea838d974a
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/Android.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk index 743d45a..f2dd1ee 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -85,11 +85,7 @@ define build-libart-disassembler LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include external/libcxx/libcxx.mk # For disassembler_arm64. - ifeq ($$(art_ndebug_or_debug),debug) - LOCAL_SHARED_LIBRARIES += libvixld - else - LOCAL_SHARED_LIBRARIES += libvixl - endif + LOCAL_SHARED_LIBRARIES += libvixl ifeq ($$(art_target_or_host),target) include $(BUILD_SHARED_LIBRARY) else # host |