From fae280264e64f88057cdaf530fc94bcbceb48fe1 Mon Sep 17 00:00:00 2001 From: Isaac Chen Date: Tue, 18 Jun 2019 15:57:51 +0800 Subject: [PATCH] Disable apex update for GSI Currently, GSI does not include apex support and TARGET_FLATTEN_APEX is true. This will cause issues for vendors with apex support (e.g. Cuttlefish). This change set ro.apex.updatable to false in product to override that sets in vendor. Bug: 135411972 Bug: 134673003 Test: $ lunch aosp_x86-userdebug; m -j; emulator $ lunch aosp_cf_x86_phone-userdebug # Replace system.img in super.img with GSI # The resulted CF could boot and browse the web successfully. Change-Id: I08fd7a1b254aac276926329e064c35b714764936 --- target/product/gsi_common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/product/gsi_common.mk b/target/product/gsi_common.mk index 0e9b29e72..064cf03b0 100644 --- a/target/product/gsi_common.mk +++ b/target/product/gsi_common.mk @@ -23,6 +23,11 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_product.mk) # Default AOSP sounds $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) +# GSI doesn't support apex for now. +# Properties set in product take precedence over those in vendor. +PRODUCT_PRODUCT_PROPERTIES += \ + ro.apex.updatable=false + # Additional settings used in all AOSP builds PRODUCT_PROPERTY_OVERRIDES += \ ro.config.ringtone=Ring_Synth_04.ogg \