diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2020-12-14 00:31:16 -0800 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2020-12-14 00:31:16 -0800 |
| commit | 4cce0481bcd8048e379e491ab7c74ac96411aabc (patch) | |
| tree | f47b6d2159f39a8ce5aa7b10df00d46d81784651 | |
| parent | 0b5b03c76b71ef52c339a42dbb8c36d9d912c494 (diff) | |
| parent | 8f908ea34c349aaed35189baa511af495913eed8 (diff) | |
Merge 8f908ea34c349aaed35189baa511af495913eed8 on remote branch
Change-Id: I2e2d51fc5f10fadfeb64374924169ee7dbeaa215
| -rw-r--r-- | MergeConfig.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MergeConfig.mk b/MergeConfig.mk index 9c0ba0a..030cd75 100644 --- a/MergeConfig.mk +++ b/MergeConfig.mk @@ -1,7 +1,7 @@ # QSSI merge config files ifeq ($(ENABLE_AB), true) # Handle Case for QSSI-Dynamic Partition - ifeq ($(BOARD_DYNAMIC_PARTITION_ENABLE), true) + ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS), true) $(call dist-for-goals,droidcore,device/qcom/vendor-common/ota_merge_configs/dynamic_partition/ab/merge_config_system_misc_info_keys) $(call dist-for-goals,droidcore,device/qcom/vendor-common/ota_merge_configs/dynamic_partition/ab/merge_config_other_item_list) $(call dist-for-goals,droidcore,device/qcom/vendor-common/ota_merge_configs/dynamic_partition/ab/merge_config_system_item_list) @@ -12,7 +12,7 @@ ifeq ($(ENABLE_AB), true) endif else # Handle Case for QSSI-Dynamic Partition - ifeq ($(BOARD_DYNAMIC_PARTITION_ENABLE), true) + ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS), true) $(call dist-for-goals,droidcore,device/qcom/vendor-common/ota_merge_configs/dynamic_partition/non_ab/merge_config_system_item_list) $(call dist-for-goals,droidcore,device/qcom/vendor-common/ota_merge_configs/dynamic_partition/non_ab/merge_config_other_item_list) $(call dist-for-goals,droidcore,device/qcom/vendor-common/ota_merge_configs/dynamic_partition/non_ab/merge_config_system_misc_info_keys) |