summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2016-02-05 17:07:09 -0500
committerMike Frysinger <vapier@google.com>2016-02-05 17:07:09 -0500
commitd416513fba3a9c057e81917eaf0d7217fc2a7bb6 (patch)
tree488245e6cdf7ce4c814635be012dd1dae2b45169
parent3c13bf176ea4d46ac29a7d6525aca47ac6d27128 (diff)
downloadintegration-d416513fba3a9c057e81917eaf0d7217fc2a7bb6.tar.gz
use HOST_OUT_EXECUTABLES for host tools
This appears to be necessary on the builders. BUG=b:26861037 TEST=building arm w/python enabled still works locally Change-Id: Ie2ce704df781bd2cbf89dea2c15e58be61adc8d6
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index ed70f15..3240a5b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -94,8 +94,8 @@ ifneq ($(PRODUCT_3RD_PARTY_PACKAGES),)
mv $@.tmp $@; \
exit 0; \
fi; \
- emerge -uN $(3RD_PARTY_PACKAGES_QUOTED) || exit; \
- 3rd-party-merge \
+ $(HOST_OUT_EXECUTABLES)/emerge -uN $(3RD_PARTY_PACKAGES_QUOTED) || exit; \
+ $(HOST_OUT_EXECUTABLES)/3rd-party-merge \
$(patsubst %,--package %,$(3RD_PARTY_PACKAGES_QUOTED)) \
--input-root $(3RD_PARTY_ROOT) \
--output-root $(TARGET_OUT) \