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

Commit 3c0a3b5c authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "Enable Batch writes for OTA installation." am: 529aa128 am: dbe1b59d am: c0180130 

Original change: https://android-review.googlesource.com/c/platform/build/+/2372277



Change-Id: Iebaae138fa0a19dea9b056c5cad1ae80e87df362
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60c73a98 c0180130

target/product/virtual_ab_ota/android_t_baseline.mk

+7 −25
Original line number Original line Diff line number Diff line
@@ -12,29 +12,11 @@ 
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# See the License for the specific language governing permissions and

# limitations under the License.

# limitations under the License.

#





# This file enables baseline features, such as io_uring,

# This file should be used only for T launching devices. We maintain

# userspace merge, etc. But sets compression method to none.

# this file just for backward compatibility for T launch devices

# This .mk file also removes snapuserd from vendor ramdisk,

# so that build doesn't break.

# as T launching devices will have init_boot which has snapuserd

#

# in generic ramdisk.

# All U+ launching devices should instead use vabc_features.mk.

# T launching devices should include this .mk file, and configure

$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/vabc_features.mk)
 
# compression algorithm by setting

# PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD to gz or brotli. Complete

# set of supported algorithms can be found in

# system/core/fs_mgr/libsnapshot/cow_writer.cpp



PRODUCT_VIRTUAL_AB_OTA := true



PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.enabled=true



PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.userspace.snapshots.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.io_uring.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.xor.enabled=true



PRODUCT_VIRTUAL_AB_COMPRESSION := true

PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD ?= none

PRODUCT_PACKAGES += \

    snapuserd \

target/product/virtual_ab_ota/compression.mk

+6 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_ven 
PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.userspace.snapshots.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.userspace.snapshots.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.io_uring.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.io_uring.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.batch_writes=true



# Enabling this property, will improve OTA install time

# but will use an additional CPU core

# PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.threads=true



PRODUCT_VIRTUAL_AB_COMPRESSION := true

PRODUCT_VIRTUAL_AB_COMPRESSION := true

PRODUCT_PACKAGES += \

PRODUCT_PACKAGES += \

    snapuserd.vendor_ramdisk \

    snapuserd.vendor_ramdisk \

target/product/virtual_ab_ota/vabc_features.mk

0 → 100644
+46 −0
Original line number Original line Diff line number Diff line 
#

# Copyright (C) 2022 The Android Open-Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



# This file enables baseline features, such as io_uring,

# userspace merge, etc. But sets compression method to none.

# This .mk file also removes snapuserd from vendor ramdisk,

# as T launching devices will have init_boot which has snapuserd

# in generic ramdisk.

#

# T and U launching devices should include this .mk file, and configure

# compression algorithm by setting

# PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD to lz4, gz or brotli. Complete

# set of supported algorithms can be found in

# system/core/fs_mgr/libsnapshot/cow_writer.cpp



PRODUCT_VIRTUAL_AB_OTA := true



PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.enabled=true



PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.userspace.snapshots.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.io_uring.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.xor.enabled=true

PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.batch_writes=true



# Enabling this property, will improve OTA install time

# but will use an additional CPU core

# PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.threads=true



PRODUCT_VIRTUAL_AB_COMPRESSION := true

PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD ?= none

PRODUCT_PACKAGES += \

    snapuserd \