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

Commit 70533992 authored by T.J. Mercier's avatar T.J. Mercier Committed by Gerrit Code Review
Browse files

Merge "Add flags for cgroup v2 and memcg v2 features" into main

parents 2fc519a5 18a5d392

core/android_soong_config_vars.mk

+8 −0
Original line number Diff line number Diff line
@@ -132,6 +132,14 @@ ifdef PRODUCT_AVF_ENABLED 
$(call add_soong_config_var_value,ANDROID,avf_enabled,$(PRODUCT_AVF_ENABLED))

endif



ifdef PRODUCT_MEMCG_V2_FORCE_ENABLED

$(call add_soong_config_var_value,ANDROID,memcg_v2_force_enabled,$(PRODUCT_MEMCG_V2_FORCE_ENABLED))

endif



ifdef PRODUCT_CGROUP_V2_SYS_APP_ISOLATION_ENABLED

$(call add_soong_config_var_value,ANDROID,cgroup_v2_sys_app_isolation,$(PRODUCT_CGROUP_V2_SYS_APP_ISOLATION_ENABLED))

endif



$(call add_soong_config_var_value,ANDROID,release_avf_allow_preinstalled_apps,$(RELEASE_AVF_ALLOW_PREINSTALLED_APPS))

$(call add_soong_config_var_value,ANDROID,release_avf_enable_device_assignment,$(RELEASE_AVF_ENABLE_DEVICE_ASSIGNMENT))

$(call add_soong_config_var_value,ANDROID,release_avf_enable_dice_changes,$(RELEASE_AVF_ENABLE_DICE_CHANGES))

core/product.mk

+6 −0
Original line number Diff line number Diff line
@@ -428,6 +428,12 @@ _product_single_value_vars += PRODUCT_AVF_ENABLED 
# If true, kernel with modules will be used for Microdroid VMs.

_product_single_value_vars += PRODUCT_AVF_KERNEL_MODULES_ENABLED



# If true, the memory controller will be force-enabled in the cgroup v2 hierarchy

_product_single_value_vars += PRODUCT_MEMCG_V2_FORCE_ENABLED



# If true, the cgroup v2 hierarchy will be split into apps/system subtrees

_product_single_value_vars += PRODUCT_CGROUP_V2_SYS_APP_ISOLATION_ENABLED



# List of .json files to be merged/compiled into vendor/etc/linker.config.pb

_product_list_vars += PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS