diff options
| author | Mike Frysinger <vapier@google.com> | 2016-02-10 22:07:12 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2016-02-10 22:07:12 -0500 |
| commit | 1f772b47541dd37edbee11107b355a7ad7984bb8 (patch) | |
| tree | dc36ed9c187e87d175a3baad5d7431d0d55a06c8 | |
| parent | d416513fba3a9c057e81917eaf0d7217fc2a7bb6 (diff) | |
| download | integration-1f772b47541dd37edbee11107b355a7ad7984bb8.tar.gz | |
set up ANDROID vars emerge relies on
The buildbots run `make` directly rather than loading the envsetup.sh
file. This means none of the ANDROID vars we were using were exported.
Have the mk file recreate & pass them down.
BUG=b:26861037
TEST=`make PRODUCT-brilloemulator_arm-eng` w/python works
Change-Id: Ibdd74880b3aafa7d27eab70219ec007986f6689f
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -85,6 +85,8 @@ include $(BUILD_SYSTEM)/base_rules.mk 3RD_PARTY_PACKAGES_QUOTED := $(patsubst %,'%',$(PRODUCT_3RD_PARTY_PACKAGES)) LOCAL_BUILT_MODULE := $(intermediates)/$(LOCAL_MODULE) +# The ANDROID_xxx vars are recreated like envsetup.sh does. They are used in +# cases like `make PRODUCT-<product>-eng` which doesn't source envsetup.sh. $(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) $(hide)mkdir -p $(dir $@) $(TARGET_OUT_GENTOO)/tmp ifneq ($(PRODUCT_3RD_PARTY_PACKAGES),) @@ -94,6 +96,10 @@ ifneq ($(PRODUCT_3RD_PARTY_PACKAGES),) mv $@.tmp $@; \ exit 0; \ fi; \ + export ANDROID_TOOLCHAIN="$(PWD)/$(TARGET_TOOLCHAIN_ROOT)/bin"; \ + export ANDROID_BUILD_PATHS="$(PWD)/$(HOST_OUT_EXECUTABLES):$${ANDROID_TOOLCHAIN}:$(ANDROID_BUILD_PATHS)"; \ + export ANDROID_PRODUCT_OUT="$(PWD)/$(PRODUCT_OUT)"; \ + export ANDROID_BUILD_TOP="$(PWD)"; \ $(HOST_OUT_EXECUTABLES)/emerge -uN $(3RD_PARTY_PACKAGES_QUOTED) || exit; \ $(HOST_OUT_EXECUTABLES)/3rd-party-merge \ $(patsubst %,--package %,$(3RD_PARTY_PACKAGES_QUOTED)) \ |