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

Commit 95a543c9 authored by Ying Wang's avatar Ying Wang Committed by Dan Albert
Browse files

Set up environmental variable PATH before calling releasetools scripts. 

Some releasetools python sripts rely on $PATH to search for the
executables. With this change, you don't need to run lunch even after you
change the build system variable OUT_DIR.

Bug: 19320328
Change-Id: Ia44b11084fb1bdcceb60b1d33cb7e460c9b705a8
(cherry picked from commit 9d252e10)
parent b2cdb1cc

core/Makefile

+6 −4
Original line number Diff line number Diff line
@@ -1450,7 +1450,8 @@ ifneq ($(OEM_THUMBPRINT_PROPERTIES),) 
	$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt

endif

	$(call generate-userimage-prop-dictionary, $(zip_root)/META/misc_info.txt)

	$(hide) ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)

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

	    ./build/tools/releasetools/make_recovery_patch $(zip_root) $(zip_root)

	@# Zip everything up, preserving symlinks

	$(hide) (cd $(zip_root) && zip -qry ../$(notdir $@) .)

	@# Run fs_config on all the system, vendor, boot ramdisk,
@@ -1460,7 +1461,8 @@ endif 
	$(hide) zipinfo -1 $@ | awk 'BEGIN { FS="BOOT/RAMDISK/" } /^BOOT\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -S $(SELINUX_FC) > $(zip_root)/META/boot_filesystem_config.txt

	$(hide) zipinfo -1 $@ | awk 'BEGIN { FS="RECOVERY/RAMDISK/" } /^RECOVERY\/RAMDISK\// {print $$2}' | $(HOST_OUT_EXECUTABLES)/fs_config -C -S $(SELINUX_FC) > $(zip_root)/META/recovery_filesystem_config.txt

	$(hide) (cd $(zip_root) && zip -q ../$(notdir $@) META/*filesystem_config.txt)

	$(hide) ./build/tools/releasetools/add_img_to_target_files -p $(HOST_OUT) $@

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

	    ./build/tools/releasetools/add_img_to_target_files -p $(HOST_OUT) $@



.PHONY: target-files-package

target-files-package: $(BUILT_TARGET_FILES_PACKAGE)
@@ -1489,7 +1491,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): KEY_CERT_PAIR := $(DEFAULT_KEY_CERT_PAIR) 


$(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo "Package OTA: $@"

	$(hide) MKBOOTIMG=$(MKBOOTIMG) \

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

	   ./build/tools/releasetools/ota_from_target_files -v \

	   --block \

	   -p $(HOST_OUT) \
@@ -1518,7 +1520,7 @@ INTERNAL_UPDATE_PACKAGE_TARGET := $(PRODUCT_OUT)/$(name).zip 


$(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(DISTTOOLS)

	@echo "Package: $@"

	$(hide) MKBOOTIMG=$(MKBOOTIMG) \

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

	   ./build/tools/releasetools/img_from_target_files -v \

	   -p $(HOST_OUT) \

	   $(BUILT_TARGET_FILES_PACKAGE) $@