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

Commit a2c0101c 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."... 

Merge "Enforce the consistency between AB_OTA_UPDATER and AB_OTA_PARTITIONS." am: e3c95f71 am: 34bd3545 am: c3825ae1
am: beb729f8

Change-Id: I794ee996272bc28cfb220152678dc06c0911116d
parents 32fb8e31 beb729f8

core/Makefile

+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