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

Commit 34bd3545 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS."

am: e3c95f71

Change-Id: Id19d9ed15cea91022d2693ab8ffa01a989b1ffaa
parents fa4ea598 e3c95f71
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -4035,6 +4035,18 @@ ifeq ($(AB_OTA_UPDATER),true)
    $(BUILT_TARGET_FILES_PACKAGE): $(TARGET_OUT_OEM)/$(OSRELEASED_DIRECTORY)/product_version
    $(BUILT_TARGET_FILES_PACKAGE): $(TARGET_OUT_ETC)/$(OSRELEASED_DIRECTORY)/system_version
  endif

  # Not checking in board_config.mk, since AB_OTA_PARTITIONS may be updated in Android.mk (e.g. to
  # additionally include radio or bootloader partitions).
  ifeq ($(AB_OTA_PARTITIONS),)
    $(error AB_OTA_PARTITIONS must be defined when using AB_OTA_UPDATER)
  endif
endif

ifneq ($(AB_OTA_PARTITIONS),)
  ifneq ($(AB_OTA_UPDATER),true)
    $(error AB_OTA_UPDATER must be true when defining AB_OTA_PARTITIONS)
  endif
endif

# Run fs_config while creating the target files package