ART: fix buildbots following art-tools build change
Bug: 129323791
Bug: 128990084
Test: build/envsetup.sh
Test: lunch sdk-eng
Test: HOST_PREFER_32_BIT=true art/tools/buildbot-build.sh --host -j100
Change-Id: Ie68802ac25af042f2bb9d5bc8264f14f9892f09b
diff --git a/Android.mk b/Android.mk
index 2a74415..9222a19 100644
--- a/Android.mk
+++ b/Android.mk
@@ -448,12 +448,20 @@
LOCAL_MODULE := art-tools
LOCAL_HOST_REQUIRED_MODULES := \
ahat \
- dexdiag \
dexdump \
- dexlist \
hprof-conv \
+
+# A subset of the tools are disabled when HOST_PREFER_32_BIT is defined as make reports that
+# they are not supported on host (b/129323791). This is likely due to art_apex disabling host
+# APEX builds when HOST_PREFER_32_BIT is set (b/120617876).
+ifneq ($(HOST_PREFER_32_BIT),true)
+LOCAL_HOST_REQUIRED_MODULES += \
+ dexdiag \
+ dexlist \
oatdump \
+endif
+
include $(BUILD_PHONY_PACKAGE)
####################################################################################################