commit 3d14d2b70a26c03ca6f1a7790f6857ef5d4ab832
author Andreas Gampe <agampe@google.com> Tue Jul 18 08:36:16 2017 -0700
committer Andreas Gampe <agampe@google.com> Tue Jul 18 08:52:45 2017 -0700
tree cd4631b3a5b050da36c8708d0826d3d9eec83e33
parent d44c0d8c7f96644f8176e493de2fbde3eb198bb4

ART: Ship debug tools when including debug artifacts

We actually need to ship dex2oatd and patchoatd, as we have internal
hardcoded usage of these.

Bug: 62087184
Test: m
Change-Id: Ia80e79d221a8db91a88edf16f42b6894d3dabe38

Android.mk

diff --git a/Android.mk b/Android.mk
index 2df1b13..8735d7c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -386,11 +386,15 @@
 endif
 ifeq (true,$(art_target_include_debug_build))
 LOCAL_REQUIRED_MODULES += \
+    dex2oatd \
+    dexoptanalyzerd \
     libartd \
     libartd-compiler \
     libopenjdkd \
     libopenjdkjvmd \
     libopenjdkjvmtid \
+    patchoatd \
+    profmand \
 
 endif
 endif