diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 6 | ||||
| -rw-r--r-- | core/board_config.mk | 2 | ||||
| -rw-r--r-- | core/clear_vars.mk | 3 | ||||
| -rw-r--r-- | core/config.mk | 4 | ||||
| -rw-r--r-- | core/product.mk | 5 | ||||
| -rw-r--r-- | core/sysprop.mk | 14 | ||||
| -rw-r--r-- | core/version_defaults.mk | 1 |
7 files changed, 30 insertions, 5 deletions
diff --git a/core/Makefile b/core/Makefile index d358be470b..32c0b216b5 100644 --- a/core/Makefile +++ b/core/Makefile @@ -4556,6 +4556,9 @@ endif ifeq ($(BOARD_USES_FULL_RECOVERY_IMAGE),true) $(hide) echo "full_recovery_image=true" >> $@ endif +ifdef BUILDING_VENDOR_IMAGE + $(hide) echo "board_builds_vendorimage=true" >> $@ +endif ifdef BOARD_USES_VENDORIMAGE $(hide) echo "board_uses_vendorimage=true" >> $@ endif @@ -4683,6 +4686,9 @@ endif ifeq ($(TARGET_FLATTEN_APEX),false) $(hide) echo "target_flatten_apex=false" >> $@ endif +ifneq ($(TARGET_OTA_ASSERT_DEVICE),) + $(hide) echo "ota_override_device=$(TARGET_OTA_ASSERT_DEVICE)" >> $@ +endif .PHONY: misc_info misc_info: $(INSTALLED_MISC_INFO_TARGET) diff --git a/core/board_config.mk b/core/board_config.mk index ea6ec1e4ec..f73b558b7f 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -157,6 +157,8 @@ endif # ############################################################### $(foreach v,$(_build_broken_var_list),$(eval $(v) :=)) BUILD_BROKEN_NINJA_USES_ENV_VARS := +BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true +BUILD_BROKEN_DUP_SYSPROP := true # Boards may be defined under $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE) # or under vendor/*/$(TARGET_DEVICE). Search in both places, but diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 9487e78121..294a2e8aaf 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -502,6 +502,9 @@ LOCAL_TEST_PACKAGE := full_android_manifest := non_system_module := +# Include any vendor specific clear_vars.mk file +-include vendor/*/build/core/clear_vars.mk + # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # iterate over thousands of entries every time. # Leave the current makefile to make sure we don't break anything diff --git a/core/config.mk b/core/config.mk index b19de7c84a..4d2c43d344 100644 --- a/core/config.mk +++ b/core/config.mk @@ -319,6 +319,10 @@ include $(BUILD_SYSTEM)/envsetup.mk # See envsetup.mk for a description of SCAN_EXCLUDE_DIRS FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git) +ifneq ($(ICE_BUILD),) +include vendor/ice/target/board/BoardConfigICE.mk +endif + # The build system exposes several variables for where to find the kernel # headers: # TARGET_DEVICE_KERNEL_HEADERS is automatically created for the current diff --git a/core/product.mk b/core/product.mk index d3b2e39521..d846998b1d 100644 --- a/core/product.mk +++ b/core/product.mk @@ -114,6 +114,9 @@ _product_single_value_vars := # Variables that are lists of values. _product_list_vars := +# Add support to override build.prop values +_product_list_vars += PRODUCT_BUILD_PROP_OVERRIDES + _product_single_value_vars += PRODUCT_NAME _product_single_value_vars += PRODUCT_MODEL @@ -600,9 +603,11 @@ _readonly_late_variables := \ # Modified internally in the build system _readonly_late_variables += \ + PRODUCT_CFI_INCLUDE_PATHS \ PRODUCT_COPY_FILES \ PRODUCT_DEX_PREOPT_NEVER_ALLOW_STRIPPING \ PRODUCT_DEX_PREOPT_BOOT_FLAGS \ + PRODUCT_SOONG_NAMESPACES _readonly_early_variables := $(filter-out $(_readonly_late_variables),$(_product_var_list)) diff --git a/core/sysprop.mk b/core/sysprop.mk index 249212d1b9..a5a8f00905 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -30,6 +30,8 @@ POST_PROCESS_PROPS := $(HOST_OUT_EXECUTABLES)/post_process_props$(HOST_EXECUTABL # $(1): Partition name # $(2): Output file name define generate-common-build-props + bash -c '\ + $(or $(PRODUCT_BUILD_PROP_OVERRIDES),:);\ echo "####################################" >> $(2);\ echo "# from generate-common-build-props" >> $(2);\ echo "# These properties identify this partition image." >> $(2);\ @@ -42,10 +44,10 @@ define generate-common-build-props echo "ro.product.$(1).name=$(PRODUCT_SYSTEM_NAME)" >> $(2);\ ,\ echo "ro.product.$(1).brand=$(PRODUCT_BRAND)" >> $(2);\ - echo "ro.product.$(1).device=$(TARGET_DEVICE)" >> $(2);\ + echo "ro.product.$(1).device=$${TARGET_DEVICE:-$(TARGET_DEVICE)}" >> $(2);\ echo "ro.product.$(1).manufacturer=$(PRODUCT_MANUFACTURER)" >> $(2);\ - echo "ro.product.$(1).model=$(PRODUCT_MODEL)" >> $(2);\ - echo "ro.product.$(1).name=$(TARGET_PRODUCT)" >> $(2);\ + echo "ro.product.$(1).model=$${PRODUCT_MODEL:-$(PRODUCT_MODEL)}" >> $(2);\ + echo "ro.product.$(1).name=$${TARGET_PRODUCT:-$(TARGET_PRODUCT)}" >> $(2);\ )\ $(if $(filter system vendor odm,$(1)),\ echo "ro.$(1).product.cpu.abilist=$(TARGET_CPU_ABI_LIST) " >> $(2);\ @@ -62,6 +64,7 @@ define generate-common-build-props echo "ro.$(1).build.version.release=$(PLATFORM_VERSION_LAST_STABLE)" >> $(2);\ echo "ro.$(1).build.version.release_or_codename=$(PLATFORM_VERSION)" >> $(2);\ echo "ro.$(1).build.version.sdk=$(PLATFORM_SDK_VERSION)" >> $(2);\ + ';\ endef @@ -149,7 +152,7 @@ endif ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey) BUILD_KEYS := test-keys else -BUILD_KEYS := dev-keys +BUILD_KEYS := release-keys endif BUILD_VERSION_TAGS += $(BUILD_KEYS) BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS))) @@ -234,6 +237,7 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B $(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \ TARGET_BUILD_FLAVOR="$(TARGET_BUILD_FLAVOR)" \ TARGET_DEVICE="$(TARGET_DEVICE)" \ + ICE_DEVICE="$(TARGET_DEVICE)" \ PRODUCT_DEFAULT_LOCALE="$(call get-default-product-locale,$(PRODUCT_LOCALES))" \ PRODUCT_DEFAULT_WIFI_CHANNELS="$(PRODUCT_DEFAULT_WIFI_CHANNELS)" \ BUILD_ID="$(BUILD_ID)" \ @@ -256,12 +260,14 @@ $(gen_from_buildinfo_sh): $(INTERNAL_BUILD_ID_MAKEFILE) $(API_FINGERPRINT) | $(B PLATFORM_VERSION_ALL_CODENAMES="$(PLATFORM_VERSION_ALL_CODENAMES)" \ PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION="$(PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION)" \ BUILD_VERSION_TAGS="$(BUILD_VERSION_TAGS)" \ + BUILD_FINGERPRINT="$(BUILD_FINGERPRINT_FROM_FILE)" \ $(if $(OEM_THUMBPRINT_PROPERTIES),BUILD_THUMBPRINT="$(BUILD_THUMBPRINT_FROM_FILE)") \ TARGET_CPU_ABI_LIST="$(TARGET_CPU_ABI_LIST)" \ TARGET_CPU_ABI_LIST_32_BIT="$(TARGET_CPU_ABI_LIST_32_BIT)" \ TARGET_CPU_ABI_LIST_64_BIT="$(TARGET_CPU_ABI_LIST_64_BIT)" \ TARGET_CPU_ABI="$(TARGET_CPU_ABI)" \ TARGET_CPU_ABI2="$(TARGET_CPU_ABI2)" \ + $(PRODUCT_BUILD_PROP_OVERRIDES) \ bash $(BUILDINFO_SH) > $@ ifdef TARGET_SYSTEM_PROP diff --git a/core/version_defaults.mk b/core/version_defaults.mk index fca8b0f3b9..48bd635ceb 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -248,7 +248,6 @@ ifndef PLATFORM_SECURITY_PATCH # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. PLATFORM_SECURITY_PATCH := 2022-05-05 endif -.KATI_READONLY := PLATFORM_SECURITY_PATCH ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP # Used to indicate the matching timestamp for the security patch string in PLATFORM_SECURITY_PATCH. |