diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-30 18:20:06 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-30 18:20:06 +0000 |
commit | 13f8f707584eb63e866f0ea5227b91c6dcc11984 (patch) | |
tree | a7ac5da375ac3c0bc931e0569b3ba4f1a9f048f7 | |
parent | ced25ac6303cde66b16844c6aec79976f44d1c53 (diff) | |
parent | 892b51ab7d25af6c50e8bb1cd616d6cde975bf10 (diff) | |
download | build-13f8f707584eb63e866f0ea5227b91c6dcc11984.tar.gz |
Merge "Move aosp_x86_64 away from non-AB" into main
-rw-r--r-- | target/product/aosp_arm64.mk | 3 | ||||
-rw-r--r-- | target/product/aosp_x86_64.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/target/product/aosp_arm64.mk b/target/product/aosp_arm64.mk index d9446153c4..364fed4efc 100644 --- a/target/product/aosp_arm64.mk +++ b/target/product/aosp_arm64.mk @@ -55,7 +55,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # All components inherited here go to vendor or vendor_boot image # $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS ?= system # # Special settings for GSI releasing diff --git a/target/product/aosp_x86_64.mk b/target/product/aosp_x86_64.mk index 4344f50cae..595940d9d1 100644 --- a/target/product/aosp_x86_64.mk +++ b/target/product/aosp_x86_64.mk @@ -57,7 +57,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # All components inherited here go to vendor image # $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86_64/device.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/non_ab_device.mk) +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS ?= system # # Special settings for GSI releasing |