StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move aosp_x86_64 away from non-AB" into main am: 13f8f70758

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3065894

Change-Id: I195e4721e4157f2da4c7accfa1b0ec7e5d74f7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-04-30 18:55:29 +00:00
committed by Automerger Merge Worker
parent 2e5fde3377 13f8f70758
commit c252a67443
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/aosp_arm64.mk
View File

@@ -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 # 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)/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 # Special settings for GSI releasing

3
target/product/aosp_x86_64.mk
View File

@@ -57,7 +57,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
# All components inherited here go to vendor image # 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)/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 # Special settings for GSI releasing