diff options
| author | 2025-01-30 04:26:41 -0800 | |
|---|---|---|
| committer | 2025-01-30 04:26:41 -0800 | |
| commit | a49804358ef6e3ad8a6a43906758875d8c947d4f (patch) | |
| tree | 919c342d9e8885458f54a060e4c69e1bc937ce33 | |
| parent | 613b67fa52f75c97aa5e9700ed3f82aa03bc8955 (diff) | |
| parent | 2a871cb63eb4ab2b55ba30fad92836afa8de9183 (diff) | |
Merge "Add flag-guarded disabling of default .art file madvise" into main am: 8e731f0596 am: 2a871cb63e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3466138
Change-Id: Idd9e8b9da66af2e9f75892bd995bf9f5c49ed8e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/jni/Android.bp | 1 | ||||
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 3afe27ea591f..a2f4ca2c1b06 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -280,6 +280,7 @@ cc_library_shared_for_libandroid_runtime { ], static_libs: [ + "android.os.flags-aconfig-cc", "libasync_safe", "libbinderthreadstateutils", "libdmabufinfo", diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index aea1734918d6..5c0b72013a06 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -22,6 +22,7 @@ #include <android-base/parsebool.h> #include <android-base/properties.h> #include <android/graphics/jni_runtime.h> +#include <android_os.h> #include <android_runtime/AndroidRuntime.h> #include <assert.h> #include <binder/IBinder.h> @@ -893,9 +894,13 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p madviseWillNeedFileSizeOdex, "-XMadviseWillNeedOdexFileSize:"); - parseRuntimeOption("dalvik.vm.madvise.artfile.size", - madviseWillNeedFileSizeArt, - "-XMadviseWillNeedArtFileSize:"); + // Historically, dalvik.vm.madvise.artfile.size was set to UINT_MAX by default. With the + // disable_madvise_art_default flag rollout, we use this default only when the flag is disabled. + // TODO(b/382110550): Remove this property/flag entirely after validating and ramping. + const char* madvise_artfile_size_default = + android::os::disable_madvise_artfile_default() ? "" : "4294967295"; + parseRuntimeOption("dalvik.vm.madvise.artfile.size", madviseWillNeedFileSizeArt, + "-XMadviseWillNeedArtFileSize:", madvise_artfile_size_default); /* * Profile related options. |