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

Commit 9b46ddbe authored by David Anderson's avatar David Anderson Committed by Android (Google) Code Review
Browse files

Merge "Remove Virtual A/B Retrofit support." into main

parents 7d9f0bed f777366b

core/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -6307,8 +6307,6 @@ define dump-dynamic-partitions-info 
# e.g. "none", "gz", "brotli"

  $(if $(PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD), \

    echo "virtual_ab_compression_method=$(PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD)" >> $(1))

  $(if $(filter true,$(PRODUCT_VIRTUAL_AB_OTA_RETROFIT)), \

    echo "virtual_ab_retrofit=true" >> $(1))

  $(if $(PRODUCT_VIRTUAL_AB_COW_VERSION), \

    echo "virtual_ab_cow_version=$(PRODUCT_VIRTUAL_AB_COW_VERSION)" >> $(1))

  $(if $(PRODUCT_VIRTUAL_AB_COMPRESSION_FACTOR), \

core/product.mk

+0 −3
Original line number Diff line number Diff line
@@ -382,9 +382,6 @@ _product_single_value_vars += PRODUCT_VIRTUAL_AB_OTA 
# If set, device uses virtual A/B Compression.

_product_single_value_vars += PRODUCT_VIRTUAL_AB_COMPRESSION



# If set, device retrofits virtual A/B.

_product_single_value_vars += PRODUCT_VIRTUAL_AB_OTA_RETROFIT



# If set, forcefully generate a non-A/B update package.

# Note: A device configuration should inherit from virtual_ab_ota_plus_non_ab.mk

# instead of setting this variable directly.

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -481,7 +481,6 @@ $(call add_json_map, PartitionVarsForSoongMigrationOnlyDoNotUse) 
      $(call end_json_map))

    $(call end_json_map)

  $(call add_json_bool, ProductVirtualAbOta, $(filter true,$(PRODUCT_VIRTUAL_AB_OTA)))

  $(call add_json_bool, ProductVirtualAbOtaRetrofit, $(filter true,$(PRODUCT_VIRTUAL_AB_OTA_RETROFIT)))

  $(call add_json_bool, ProductVirtualAbCompression, $(filter true,$(PRODUCT_VIRTUAL_AB_COMPRESSION)))

  $(call add_json_str, ProductVirtualAbCompressionMethod, $(PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD))

  $(call add_json_str, ProductVirtualAbCompressionFactor, $(PRODUCT_VIRTUAL_AB_COMPRESSION_FACTOR))

target/product/virtual_ab_ota/retrofit.mk

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
#

# Copyright (C) 2019 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.

#



$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch.mk)



PRODUCT_VIRTUAL_AB_OTA_RETROFIT := true



PRODUCT_VENDOR_PROPERTIES += ro.virtual_ab.retrofit=true

target/product/virtual_ab_ota_retrofit.mk

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
virtual_ab_ota/retrofit.mk
 
 No newline at end of file