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

Merge "Allow building generic OTA packages."

Browse Source
This commit is contained in:
Tao Bao
2019-04-11 15:51:46 +00:00
committed by Gerrit Code Review
parent 20f6491dc6 9be20c7650
commit f1a8e74991
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/Makefile
View File

@@ -3445,7 +3445,7 @@ ifeq ($(BUILD_OS),darwin)
build_ota_package := false build_ota_package := false
build_otatools_package := false build_otatools_package := false
else else
# set build_ota_package, and allow opt-out below # Set build_ota_package, and allow opt-out below.
build_ota_package := true build_ota_package := true
ifeq ($(TARGET_SKIP_OTA_PACKAGE),true) ifeq ($(TARGET_SKIP_OTA_PACKAGE),true)
build_ota_package := false build_ota_package := false
@@ -3456,20 +3456,22 @@ else
ifeq ($(TARGET_PRODUCT),sdk) ifeq ($(TARGET_PRODUCT),sdk)
build_ota_package := false build_ota_package := false
endif endif
ifneq ($(filter generic%,$(TARGET_DEVICE)),)
build_ota_package := false
endif
ifeq ($(TARGET_NO_KERNEL),true)
build_ota_package := false
endif
ifeq ($(recovery_fstab),)
build_ota_package := false
endif
ifeq ($(TARGET_BUILD_PDK),true) ifeq ($(TARGET_BUILD_PDK),true)
build_ota_package := false build_ota_package := false
endif endif
ifneq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)
ifneq ($(filter generic%,$(TARGET_DEVICE)),)
build_ota_package := false
endif
ifeq ($(TARGET_NO_KERNEL),true)
build_ota_package := false
endif
ifeq ($(recovery_fstab),)
build_ota_package := false
endif
endif # PRODUCT_BUILD_GENERIC_OTA_PACKAGE
# set build_otatools_package, and allow opt-out below # Set build_otatools_package, and allow opt-out below.
build_otatools_package := true build_otatools_package := true
ifeq ($(TARGET_SKIP_OTATOOLS_PACKAGE),true) ifeq ($(TARGET_SKIP_OTATOOLS_PACKAGE),true)
build_otatools_package := false build_otatools_package := false
@@ -3925,6 +3927,9 @@ endif
$(hide) echo 'mkbootimg_version_args=$(INTERNAL_MKBOOTIMG_VERSION_ARGS)' >> $(zip_root)/META/misc_info.txt $(hide) echo 'mkbootimg_version_args=$(INTERNAL_MKBOOTIMG_VERSION_ARGS)' >> $(zip_root)/META/misc_info.txt
$(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt $(hide) echo "multistage_support=1" >> $(zip_root)/META/misc_info.txt
$(hide) echo "blockimgdiff_versions=3,4" >> $(zip_root)/META/misc_info.txt $(hide) echo "blockimgdiff_versions=3,4" >> $(zip_root)/META/misc_info.txt
ifeq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)
$(hide) echo "build_generic_ota_package=true" >> $(zip_root)/META/misc_info.txt
endif
ifneq ($(OEM_THUMBPRINT_PROPERTIES),) ifneq ($(OEM_THUMBPRINT_PROPERTIES),)
# OTA scripts are only interested in fingerprint related properties # OTA scripts are only interested in fingerprint related properties
$(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt $(hide) echo "oem_fingerprint_properties=$(OEM_THUMBPRINT_PROPERTIES)" >> $(zip_root)/META/misc_info.txt

7
core/board_config.mk
View File

@@ -475,6 +475,13 @@ ifeq ($(AB_OTA_UPDATER),true)
endif endif
endif endif
# Sanity check for building generic OTA packages. Currently it only supports A/B OTAs.
ifeq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)
ifneq ($(AB_OTA_UPDATER),true)
$(error PRODUCT_BUILD_GENERIC_OTA_PACKAGE with 'AB_OTA_UPDATER != true' is not supported)
endif
endif
# Check BOARD_VNDK_VERSION # Check BOARD_VNDK_VERSION
define check_vndk_version define check_vndk_version
$(eval vndk_path := prebuilts/vndk/v$(1)) \ $(eval vndk_path := prebuilts/vndk/v$(1)) \

5
core/product.mk
View File

@@ -322,6 +322,11 @@ _product_var_list += \
# set this variable to prevent OTA failures. # set this variable to prevent OTA failures.
_product_var_list += PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS _product_var_list += PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
# If set to true, this product builds a generic OTA package, which installs generic system images
# onto matching devices. The product may only build a subset of system images (e.g. only
# system.img), so devices need to install the package in a system-only OTA manner.
_product_var_list += PRODUCT_BUILD_GENERIC_OTA_PACKAGE
# Whether any paths are excluded from being set XOM when ENABLE_XOM=true # Whether any paths are excluded from being set XOM when ENABLE_XOM=true
_product_var_list += PRODUCT_XOM_EXCLUDE_PATHS _product_var_list += PRODUCT_XOM_EXCLUDE_PATHS
_product_var_list += PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES _product_var_list += PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES