commit 362e9f24de01c0caf71fcc8424896649cc74e0bb
author Orion Hodson <oth@google.com> Thu Mar 28 09:30:20 2019 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 28 11:23:02 2019 +0000
tree dbccdf5cc44b6dac1499cce64a19f1a4f4d62001
parent d133917ed51afb0c57c9512fddab7c68a3a36cfe

ART: Update art-tools modules for host

Use LOCAL_IS_HOST_MODULE rather than LOCAL_HOST_REQUIRED_MODULES. The
latter appears to imply a target module build with the listed host
modules dependencies.

Fixes Mac build breakage.

Bug: 129400556
Test: "python frameworks/rs/build_rs.py" on Mac
Test: m -j100 art-tools (and check out)
Change-Id: I4a8fb0c52cf7dc241543ca7e67be69da209ce638

Android.mk

diff --git a/Android.mk b/Android.mk
index 5105617..c91f700 100644
--- a/Android.mk
+++ b/Android.mk
@@ -446,7 +446,8 @@
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := art-tools
-LOCAL_HOST_REQUIRED_MODULES := \
+LOCAL_IS_HOST_MODULE := true
+LOCAL_REQUIRED_MODULES := \
     ahat \
     dexdump \
     hprof-conv \
@@ -455,7 +456,7 @@
 # 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 += \
+LOCAL_REQUIRED_MODULES += \
     dexdiag \
     dexlist \
     oatdump \