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

Commit 05cc591f authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Gerrit Code Review
Browse files

Merge changes from topics "move-avf-jar-to-bcp", "virt-apex-on-system" 

* changes:
  Add framework-virtualization to PRODUCT_APEX_BOOT_JARS
  Unconditionally install com.android.virt APEX
parents 9e0472e9 74ab6e95

core/android_soong_config_vars.mk

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ endif 
# SystemUI.

$(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)



ifdef PRODUCT_AVF_ENABLED

$(call add_soong_config_var_value,ANDROID,avf_enabled,$(PRODUCT_AVF_ENABLED))

endif



# Enable system_server optimizations by default unless explicitly set or if

# there may be dependent runtime jars.

# TODO(b/240588226): Remove the off-by-default exceptions after handling

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -367,6 +367,9 @@ _product_single_value_vars += PRODUCT_FSVERITY_GENERATE_METADATA 
# BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE but not an explicitly set value.

_product_single_value_vars += PRODUCT_MODULE_BUILD_FROM_SOURCE



# If true, installs a full version of com.android.virt APEX.

_product_single_value_vars += PRODUCT_AVF_ENABLED



.KATI_READONLY := _product_single_value_vars _product_list_vars

_product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars)

target/product/base_system.mk

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ PRODUCT_PACKAGES += \ 
    com.android.tethering \

    com.android.tzdata \

    com.android.uwb \

    com.android.virt \

    com.android.wifi \

    ContactsProvider \

    content \

target/product/default_art_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ PRODUCT_APEX_BOOT_JARS := \ 
    com.android.tethering:framework-connectivity-t \

    com.android.tethering:framework-tethering \

    com.android.uwb:framework-uwb \

    com.android.virt:framework-virtualization \

    com.android.wifi:framework-wifi \



# List of system_server classpath jars delivered via apex.