StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop passing --block and MKBOOTIMG to ota_from_target_files."

Browse Source
This commit is contained in:
Tao Bao
2019-06-25 23:05:45 +00:00
committed by Gerrit Code Review
parent 58abe77060 c931547560
commit ac0749ff98
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/Makefile
View File

@@ -4264,14 +4264,14 @@ ifeq ($(build_ota_package),true)
# $(1): output file # $(1): output file
# $(2): additional args # $(2): additional args
define build-ota-package-target define build-ota-package-target
PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH MKBOOTIMG=$(MKBOOTIMG) \ PATH=$(INTERNAL_USERIMAGES_BINARY_PATHS):$$PATH \
build/make/tools/releasetools/ota_from_target_files -v \ build/make/tools/releasetools/ota_from_target_files \
--block \ --verbose \
--extracted_input_target_files $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) \ --extracted_input_target_files $(patsubst %.zip,%,$(BUILT_TARGET_FILES_PACKAGE)) \
-p $(HOST_OUT) \ --path $(HOST_OUT) \
$(if $(OEM_OTA_CONFIG), -o $(OEM_OTA_CONFIG)) \ $(if $(OEM_OTA_CONFIG), --oem_settings $(OEM_OTA_CONFIG)) \
$(2) \ $(2) \
$(BUILT_TARGET_FILES_PACKAGE) $(1) $(BUILT_TARGET_FILES_PACKAGE) $(1)
endef endef
name := $(TARGET_PRODUCT) name := $(TARGET_PRODUCT)