From 6b7cc73ec5477e1c4812c95b3a1ae9bcc4722077 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 20 Nov 2020 12:15:01 -0800 Subject: [PATCH] Add Virtual A/B with vendor ramdisk product. If vendor_ramdisk exists, it is preferred to use launch_with_vendor_ramdisk.mk because it moves e2fsck to vendor_ramdisk, making ramdisk smaller. Devices that uses VABC is assumed to have a vendor ramdisk, so inherit from this new makefile. Test: pass Change-Id: If6adad9985ca4750225fd4263edb42de1ddaf486 --- target/product/virtual_ab_ota/README.md | 2 ++ target/product/virtual_ab_ota/compression.mk | 2 +- .../launch_with_vendor_ramdisk.mk | 24 +++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 target/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk diff --git a/target/product/virtual_ab_ota/README.md b/target/product/virtual_ab_ota/README.md index c1d0d7d8d6..2d40c030be 100644 --- a/target/product/virtual_ab_ota/README.md +++ b/target/product/virtual_ab_ota/README.md @@ -8,6 +8,8 @@ Devices that uses Virtual A/B must inherit from one of the makefiles in this dir launch.mk |- retrofit.mk |- plus_non_ab.mk + +launch_with_vendor_ramdisk.mk |- compression.mk compression_retrofit.mk diff --git a/target/product/virtual_ab_ota/compression.mk b/target/product/virtual_ab_ota/compression.mk index 2251187375..1dd864328c 100644 --- a/target/product/virtual_ab_ota/compression.mk +++ b/target/product/virtual_ab_ota/compression.mk @@ -14,7 +14,7 @@ # limitations under the License. # -$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk) PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.compression.enabled=true diff --git a/target/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk b/target/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk new file mode 100644 index 0000000000..aeb7691160 --- /dev/null +++ b/target/product/virtual_ab_ota/launch_with_vendor_ramdisk.mk @@ -0,0 +1,24 @@ +# +# Copyright (C) 2020 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. +# + +# Devices launching with Virtual A/B and has a vendor_boot partition is +# preferred to inherit from this makefile instead of launch.mk. + +PRODUCT_VIRTUAL_AB_OTA := true + +PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.enabled=true + +PRODUCT_PACKAGES += e2fsck.vendor_ramdisk