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

Commit 8c2c54b3 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Set PATH when calling build_super_image.py." am: 7732b434 

am: b552107b

Change-Id: I28f68b248941b63c8f5f2387f50ff796af2734af
parents 34ac6c73 b552107b

core/Makefile

+5 −3
Original line number Diff line number Diff line
@@ -4057,6 +4057,7 @@ INSTALLED_SUPERIMAGE_TARGET := $(PRODUCT_OUT)/super.img 
$(INSTALLED_SUPERIMAGE_TARGET): extracted_input_target_files := $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE))

$(INSTALLED_SUPERIMAGE_TARGET): $(LPMAKE) $(BUILT_TARGET_FILES_PACKAGE) $(BUILD_SUPER_IMAGE)

	$(call pretty,"Target super fs image: $@")

	PATH=$(dir $(LPMAKE)):$$PATH \

	    $(BUILD_SUPER_IMAGE) -v $(extracted_input_target_files) $@

endif
@@ -4070,8 +4071,9 @@ $(INSTALLED_SUPERIMAGE_EMPTY_TARGET): $(LPMAKE) $(BUILD_SUPER_IMAGE) 
	rm -rf $(intermediates)/misc_info.txt

	$(call dump-dynamic-partitions-info,$(intermediates)/misc_info.txt)

ifeq ($(AB_OTA_UPDATER),true)

	$(hide) echo "ab_update=true" >> $(intermediates)/misc_info.txt

	echo "ab_update=true" >> $(intermediates)/misc_info.txt

endif

	PATH=$(dir $(LPMAKE)):$$PATH \

	    $(BUILD_SUPER_IMAGE) -v $(intermediates)/misc_info.txt $@



$(call dist-for-goals,dist_files,$(INSTALLED_SUPERIMAGE_EMPTY_TARGET))