summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBrint E. Kriebel <bkriebel@vmware.com>2012-09-20 10:48:13 -0600
committerAdnan Begovic <adnan@cyngn.com>2015-10-06 16:12:03 -0700
commit2c031b2dba7db882e70c44549544414614ba8a61 (patch)
tree28f3fc5e27b87aa3e54b279ecf2cffbd25482594 /core
parent873fa569d565553fab348d4af6dcbe137dc52511 (diff)
downloadbuild-2c031b2dba7db882e70c44549544414614ba8a61.zip
build-2c031b2dba7db882e70c44549544414614ba8a61.tar.gz
build-2c031b2dba7db882e70c44549544414614ba8a61.tar.bz2
build: Pass OTAPACKAGE location to squisher
Pass the OTAPACKAGE location so we don't have to guess what the package name will be. This fixes an issue when BUILD_NUMBER is defined in an environment with automated builds. Change-Id: Iab18b541de37c99d237aabc3cb7b2e9ab076617b
Diffstat (limited to 'core')
-rw-r--r--core/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/Makefile b/core/Makefile
index 59ca703..83dfe55 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1605,10 +1605,10 @@ otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
bacon: otapackage
ifneq ($(TARGET_CUSTOM_RELEASETOOL),)
@echo -e ${CL_YLW}"Running custom releasetool..."${CL_RST}
- $(hide) $(TARGET_CUSTOM_RELEASETOOL)
+ $(hide) OTAPACKAGE=$(PWD)/$(INTERNAL_OTA_PACKAGE_TARGET) $(TARGET_CUSTOM_RELEASETOOL)
else
@echo -e ${CL_YLW}"Running releasetool..."${CL_RST}
- $(hide) ./vendor/cm/tools/squisher
+ $(hide) OTAPACKAGE=$(PWD)/$(INTERNAL_OTA_PACKAGE_TARGET) ./vendor/cm/tools/squisher
endif
endif # recovery_fstab is defined