diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-17 20:04:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-17 20:04:50 +0000 |
| commit | a8bb538db623c38d366dd9cccf2a4a657cd124ae (patch) | |
| tree | 444d145431896bda92598fb9357ab132ee52e99d | |
| parent | a65a617855c71242b4b76e8a124e5bfb436c9975 (diff) | |
| parent | a8c687ff4ff2108db4aaa320aa1d7c768839fbaa (diff) | |
| download | build-a8bb538db623c38d366dd9cccf2a4a657cd124ae.tar.gz | |
Merge "Document that ro.dalvik.vm.enable_uffd_gc has a limited lifetime." into main
| -rw-r--r-- | core/product.mk | 3 | ||||
| -rw-r--r-- | core/sysprop_config.mk | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/product.mk b/core/product.mk index 0a761fb44e..ec377b7824 100644 --- a/core/product.mk +++ b/core/product.mk @@ -447,7 +447,8 @@ _product_list_vars += PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS # device may have to re-compile everything on the first boot if the kernel doesn't support # userfaultfd # - "false": disallows the build system and the runtime to use userfaultfd GC even if the device -# supports it +# supports it. This option is temporary - the plan is to remove it by Aug 2025, at which time +# Mainline updates of the ART module will ignore it as well. _product_single_value_vars += PRODUCT_ENABLE_UFFD_GC # Specifies COW version to be used by update_engine and libsnapshot. If this value is not diff --git a/core/sysprop_config.mk b/core/sysprop_config.mk index a019a7d2c3..e8428c8eaf 100644 --- a/core/sysprop_config.mk +++ b/core/sysprop_config.mk @@ -265,6 +265,9 @@ ADDITIONAL_SYSTEM_PROPERTIES += ro.force.debuggable=0 config_enable_uffd_gc := \ $(firstword $(OVERRIDE_ENABLE_UFFD_GC) $(PRODUCT_ENABLE_UFFD_GC) default) +# This is a temporary system property that controls the ART module. The plan is +# to remove it by Aug 2025, at which time Mainline updates of the ART module +# will ignore it as well. # If the value is "default", it will be mangled by post_process_props.py. ADDITIONAL_PRODUCT_PROPERTIES += ro.dalvik.vm.enable_uffd_gc=$(config_enable_uffd_gc) |