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

Commit dcdc4d25 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add A/B update to GSI" into stage-dr1-aosp-master

parents db3d1712 cc5a1aac

target/product/aosp_arm.mk

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ 
# limitations under the License.

#



# The system image of aosp_arm-userdebug is a GSI for the devices with:

# - ARM 32 bits user space

# - 64 bits binder interface

# - system-as-root

# - VNDK enforcement

# - compatible property override enabled



-include device/generic/goldfish/arm32-vendor.mk



# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor
@@ -22,6 +29,13 @@ PRODUCT_PACKAGES += \ 


include $(SRC_TARGET_DIR)/product/full.mk



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true

target/product/aosp_arm64.mk

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ 
# limitations under the License.

#



# The system image of aosp_arm64-userdebug is a GSI for the devices with:

# - ARM 64 bits user space

# - 64 bits binder interface

# - system-as-root

# - VNDK enforcement

# - compatible property override enabled



# This is a build configuration for a full-featured build of the

# Open-Source part of the tree. It's geared toward a US-centric

# build quite specifically for the emulator, and might not be
@@ -38,6 +45,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) 
$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)

$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true

target/product/aosp_arm64_ab.mk

+12 −0
Original line number Diff line number Diff line
@@ -19,8 +19,20 @@ 
# on the generic system image, place them in build/make/target/board/

# treble_system.prop.



# aosp_arm64_ab-userdebug is a Legacy GSI for the devices with:

# - ARM 64 bits user space

# - 64 bits binder interface

# - system-as-root



include build/make/target/product/treble_common_64.mk



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier



PRODUCT_NAME := aosp_arm64_ab

PRODUCT_DEVICE := generic_arm64_ab

PRODUCT_BRAND := Android

target/product/aosp_arm_ab.mk

+12 −0
Original line number Diff line number Diff line
@@ -19,8 +19,20 @@ 
# on the generic system image, place them in build/make/target/board/

# treble_system.prop.



# aosp_arm_ab-userdebug is a Legacy GSI for the devices with:

# - ARM 32 bits user space

# - 32 bits binder interface

# - system-as-root



include build/make/target/product/treble_common_32.mk



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier



PRODUCT_NAME := aosp_arm_ab

PRODUCT_DEVICE := generic_arm_ab

PRODUCT_BRAND := Android

target/product/aosp_x86.mk

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,13 @@ 
# limitations under the License.

#



# The system image of aosp_x86-userdebug is a GSI for the devices with:

# - x86 32 bits user space

# - 64 bits binder interface

# - system-as-root

# - VNDK enforcement

# - compatible property override enabled



-include device/generic/goldfish/x86-vendor.mk



# TODO(b/78308559): includes vr_hwc into GSI before vr_hwc move to vendor
@@ -22,6 +29,13 @@ PRODUCT_PACKAGES += \ 


include $(SRC_TARGET_DIR)/product/full_x86.mk



# Enable A/B update

AB_OTA_UPDATER := true

AB_OTA_PARTITIONS := system

PRODUCT_PACKAGES += \

    update_engine \

    update_verifier



# Needed by Pi newly launched device to pass VtsTrebleSysProp on GSI

PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true