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

Commit 09dcc686 authored by Jiyong Park's avatar Jiyong Park Committed by Anton Hansson
Browse files

updatable_apex.mk is not inherited from mainline_system.mk 

mainline_system.mk is inherited by not only Pixels but also products
like GSI and sdk_gphone where kernel isn't capable of supporting
updatable APEX.

Stop inheriting updatable_apex.mk from mainline_system.mk and let each
product to decide whether or not to inherit updatable_apex.mk.

Also, TARGET_FLATTEN_APEX is not set to true for GSI as it is the
default setting.

Bug: 132664085
Test: choosecombo 1 aosp_arm64 userdebug; get_build_var
TARGET_FLATTEN_APEX shows true
choosecombo 1 sdk_gphone userdebug; get_build_var TARGET_FLATTEN_APEX
shows true

Change-Id: I3c4e1e4b2bbebd675904d148dd18acb57ecbdfe9
Merged-In: I3c4e1e4b2bbebd675904d148dd18acb57ecbdfe9
(cherry picked from commit 5fd45bbe)
parent 218adad1

target/board/BoardConfigGsiCommon.mk

+0 −4
Original line number Diff line number Diff line
@@ -55,7 +55,3 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 


# Disable 64 bit mediadrmserver

TARGET_ENABLE_MEDIADRM_64 :=
 


# Ordinary (non-flattened) APEX may require kernel changes. For maximum compatibility,

# use flattened APEX for GSI

TARGET_FLATTEN_APEX := true

target/product/mainline_system.mk

+3 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk)

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

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

# Enable updating of APEXes

#$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)

# Add adb keys to debuggable AOSP builds (if they exist)

$(call inherit-product-if-exists, vendor/google/security/adb/vendor_key.mk)
@@ -105,6 +103,9 @@ PRODUCT_HOST_PACKAGES += \ 
# Enable dynamic partition size

PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true



PRODUCT_PACKAGES += \

    com.android.apex.cts.shim.v1_prebuilt



PRODUCT_NAME := mainline_system

PRODUCT_BRAND := generic

target/product/updatable_apex.mk

+0 −1
Original line number Diff line number Diff line
@@ -17,5 +17,4 @@ 
# Inherit this when the target needs to support updating APEXes



PRODUCT_PROPERTY_OVERRIDES := ro.apex.updatable=true

PRODUCT_PACKAGES := com.android.apex.cts.shim.v1_prebuilt

TARGET_FLATTEN_APEX := false