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

Commit 6959dea6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"" am: 3946ea03 

Original change: https://android-review.googlesource.com/c/platform/build/+/2267723



Change-Id: I381e453bbf60c527068a5b87b2faad828dc4ea81
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc4666dd 3946ea03

core/config.mk

+5 −2
Original line number Original line Diff line number Diff line
@@ -166,8 +166,6 @@ $(KATI_obsolete_var PRODUCT_SUPPORTS_VERITY_FEC,VB 1.0 and related variables are 
$(KATI_obsolete_var PRODUCT_SUPPORTS_BOOT_SIGNER,VB 1.0 and related variables are no longer supported)

$(KATI_obsolete_var PRODUCT_SUPPORTS_BOOT_SIGNER,VB 1.0 and related variables are no longer supported)

$(KATI_obsolete_var PRODUCT_VERITY_SIGNING_KEY,VB 1.0 and related variables are no longer supported)

$(KATI_obsolete_var PRODUCT_VERITY_SIGNING_KEY,VB 1.0 and related variables are no longer supported)

$(KATI_obsolete_var BOARD_PREBUILT_PVMFWIMAGE,pvmfw.bin is now built in AOSP and custom versions are no longer supported)

$(KATI_obsolete_var BOARD_PREBUILT_PVMFWIMAGE,pvmfw.bin is now built in AOSP and custom versions are no longer supported)

$(KATI_obsolete_var BOARD_BUILD_SYSTEM_ROOT_IMAGE)



# Used to force goals to build.  Only use for conditionally defined goals.

# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE

.PHONY: FORCE

FORCE:

FORCE:
@@ -868,6 +866,11 @@ ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true) 
  endif

  endif

endif

endif





# TODO(b/241346584): Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var after all users are removed

ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)

    $(error BOARD_BUILD_SYSTEM_ROOT_IMAGE is deprecated)

endif



ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

    ifneq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)

    ifneq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)

        $(error PRODUCT_USE_DYNAMIC_PARTITION_SIZE must be true for devices with dynamic partitions)

        $(error PRODUCT_USE_DYNAMIC_PARTITION_SIZE must be true for devices with dynamic partitions)