Skip to content

edit ota package generation #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xihua-chen wants to merge 4 commits into
base: master
Choose a base branch
from
Open

edit ota package generation #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
753c276
Update flashfiles.mk
xihua-chen Aug 14, 2020
bb13396
edit ota package generation
xihua-chen Aug 14, 2020
79c0ab3
Update flashfiles.mk
xihua-chen Aug 14, 2020
7147f17
Update flashfiles.mk
xihua-chen Aug 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions tasks/flashfiles.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ ifneq ($(FLASHFILE_VARIANTS),)
$(if $(mvcfg_dev), $(eval mvcfg_default_arg = $(mvcfg_dev)),$(eval mvcfg_default_arg = $(MV_CONFIG_DEFAULT_TYPE)))
$(hide) $(fftf) --variant=$(DEV) --mv_config_default=$(notdir $(mvcfg_default_arg)) $(BUILT_TARGET_FILES_PACKAGE) $@
endif
endif # Generate variant-specific files

ifneq ($(TARGET_SKIP_OTA_PACKAGE), true)
# Generate OTA fixup files
INTEL_OTA_PACKAGES :=
$(foreach var,$(OTA_VARIANTS), \
$(info Adding $(var)) \
$(eval fn_prefix := $(PRODUCT_OUT)/$(TARGET_PRODUCT)) \
$(eval fn_suffix := $(var)-$(FILE_NAME_TAG)) \
$(eval ota_zip := $(fn_prefix)-ota-$(fn_suffix).zip) \
$(eval INTEL_OTA_PACKAGES += $(ota_zip)) \
$(call dist-for-goals,droidcore,$(ota_zip):$(notdir $(ota_zip))))
$(info Re-generating) \
$(eval fn_prefix := $(PRODUCT_OUT)/$(TARGET_PRODUCT)) \
$(eval fn_suffix := $(FILE_NAME_TAG)) \
$(eval ota_zip := $(fn_prefix)-ota-$(fn_suffix)-new.zip) \
$(eval INTEL_OTA_PACKAGES += $(ota_zip)) \
$(call dist-for-goals,droidcore,$(ota_zip):$(notdir $(ota_zip)))

$(INTEL_OTA_PACKAGES): $(INTERNAL_OTA_PACKAGE_TARGET) $(BUILT_TARGET_FILES_PACKAGE) $(odf) $(DISTTOOLS)
$(hide) mkdir -p $(dir $@)
Expand All @@ -86,8 +86,6 @@ ifneq ($(TARGET_SKIP_OTA_PACKAGE), true)
otapackage: $(INTEL_OTA_PACKAGES)
endif

endif # Generate variant-specific files

#Flag for unified flashfile when variants exist
ifneq ($(FLASHFILE_VARIANTS),)
FLASHFILES_ADD_ARGS := '--unified-variants'
Expand Down