diff options
| author | Serban Constantinescu <serban.constantinescu@arm.com> | 2014-11-13 11:14:25 +0000 |
|---|---|---|
| committer | Serban Constantinescu <serban.constantinescu@arm.com> | 2014-11-14 19:02:47 +0000 |
| commit | 195c576fbff290d4c313b67ed24ca36f2531acc4 (patch) | |
| tree | 0565c97102cc73fa989b6df822b9f2b3f1022a6c /disassembler | |
| parent | ff5298ff1640b730ee62c90ca78fc96b7ee82ec4 (diff) | |
| download | art-195c576fbff290d4c313b67ed24ca36f2531acc4.zip art-195c576fbff290d4c313b67ed24ca36f2531acc4.tar.gz art-195c576fbff290d4c313b67ed24ca36f2531acc4.tar.bz2 | |
Arm64: Use the debug version of VIXL for debug builds.
This patch builds the debug version of ART against VIXL debug. In this
way VIXL will assert misuses of the assembler and disassembler.
Change-Id: Ic4654eb20e420f23b40e96a69be452dc50770c1c
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Diffstat (limited to 'disassembler')
| -rw-r--r-- | disassembler/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/disassembler/Android.mk b/disassembler/Android.mk index f2dd1ee..743d45a 100644 --- a/disassembler/Android.mk +++ b/disassembler/Android.mk @@ -85,7 +85,11 @@ define build-libart-disassembler LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk include external/libcxx/libcxx.mk # For disassembler_arm64. - LOCAL_SHARED_LIBRARIES += libvixl + ifeq ($$(art_ndebug_or_debug),debug) + LOCAL_SHARED_LIBRARIES += libvixld + else + LOCAL_SHARED_LIBRARIES += libvixl + endif ifeq ($$(art_target_or_host),target) include $(BUILD_SHARED_LIBRARY) else # host |