Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f798c6c authored by Thierry Strudel's avatar Thierry Strudel Committed by Android Git Automerger
Browse files

am 8d7066c1: am 6b74f21a: oem_image/custom_image: fix missing new parameter to build_image.py 

* commit '8d7066c1':
  oem_image/custom_image: fix missing new parameter to build_image.py
parents 460a5abb 8d7066c1

core/tasks/oem_image.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

	$(call generate-userimage-prop-dictionary, $(oemimage_intermediates)/oem_image_info.txt, skip_fsck=true)

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

	  ./build/tools/releasetools/build_image.py \

	  ./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))

	$(hide) $(call assert-max-image-size,$@,$(BOARD_OEMIMAGE_PARTITION_SIZE))





.PHONY: oem_image

.PHONY: oem_image

core/tasks/tools/build_custom_image.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -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) echo "oem.buildnumber=$(BUILD_NUMBER)" >> $(PRIVATE_STAGING_DIR)/oem.prop)

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH \

	  ./build/tools/releasetools/build_image.py \

	  ./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 := $(PRODUCT_OUT)/$(notdir $(my_built_custom_image))

$(my_installed_custom_image) : $(my_built_custom_image)

$(my_installed_custom_image) : $(my_built_custom_image)