From 6b74f21a4d3ff7ed7bb8463210263e9ecb27830a Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Mon, 13 Jul 2015 14:40:36 -0700 Subject: [PATCH] oem_image/custom_image: fix missing new parameter to build_image.py Bug: 22441494 Change-Id: I0baa4db67ab7a17dc89193511702ed98e7515318 Signed-off-by: Thierry Strudel --- core/tasks/oem_image.mk | 2 +- core/tasks/tools/build_custom_image.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/tasks/oem_image.mk b/core/tasks/oem_image.mk index 26b9aba01..32d56a76e 100644 --- a/core/tasks/oem_image.mk +++ b/core/tasks/oem_image.mk @@ -36,7 +36,7 @@ $(INSTALLED_OEMIMAGE_TARGET) : $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_OEMIMAGE_F $(call generate-userimage-prop-dictionary, $(oemimage_intermediates)/oem_image_info.txt, skip_fsck=true) $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \ ./build/tools/releasetools/build_image.py \ - $(TARGET_OUT_OEM) $(oemimage_intermediates)/oem_image_info.txt $@ + $(TARGET_OUT_OEM) $(oemimage_intermediates)/oem_image_info.txt $@ $(TARGET_OUT) $(hide) $(call assert-max-image-size,$@,$(BOARD_OEMIMAGE_PARTITION_SIZE)) .PHONY: oem_image diff --git a/core/tasks/tools/build_custom_image.mk b/core/tasks/tools/build_custom_image.mk index 4dc86aa34..ec491fa85 100644 --- a/core/tasks/tools/build_custom_image.mk +++ b/core/tasks/tools/build_custom_image.mk @@ -104,7 +104,7 @@ $(my_built_custom_image): $(INTERNAL_USERIMAGES_DEPS) $(my_built_modules) $(my_i $(hide) echo "oem.buildnumber=$(BUILD_NUMBER)" >> $(PRIVATE_STAGING_DIR)/oem.prop) $(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \ ./build/tools/releasetools/build_image.py \ - $(PRIVATE_STAGING_DIR) $(PRIVATE_INTERMEDIATES)/image_info.txt $@ + $(PRIVATE_STAGING_DIR) $(PRIVATE_INTERMEDIATES)/image_info.txt $@ $(TARGET_OUT) my_installed_custom_image := $(PRODUCT_OUT)/$(notdir $(my_built_custom_image)) $(my_installed_custom_image) : $(my_built_custom_image) -- 2.11.0