diff options
| author | Wessam Hassanein <wessam@google.com> | 2021-05-07 03:39:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-07 03:39:05 +0000 |
| commit | 0e86b445bb88bfaf9e6330773aeade0820ee1cac (patch) | |
| tree | 370531f02665d114f745b9cd606bdad30b5820f2 /core/jni/AndroidRuntime.cpp | |
| parent | 2ec957d62b93ad63168005e8d79874435eadf14f (diff) | |
| parent | a431288fbed7618cf69991578b51453afd168e7b (diff) | |
Merge "Enable PerfettoJavaHeapStackProf in the zygote." am: 45087d31f8 am: 12dfac6247 am: a431288fbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1692305
Change-Id: I2a54da650a1e8d35530cdf77a41a338ab90582e6
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 6755be13c933..f76cccb65973 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -671,6 +671,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p char extraOptsBuf[PROPERTY_VALUE_MAX]; char voldDecryptBuf[PROPERTY_VALUE_MAX]; char perfettoHprofOptBuf[sizeof("-XX:PerfettoHprof=") + PROPERTY_VALUE_MAX]; + char perfettoJavaHeapStackOptBuf[ + sizeof("-XX:PerfettoJavaHeapStackProf=") + PROPERTY_VALUE_MAX]; enum { kEMDefault, kEMIntPortable, @@ -785,6 +787,10 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p parseRuntimeOption("dalvik.vm.perfetto_hprof", perfettoHprofOptBuf, "-XX:PerfettoHprof=", "true"); + // Enable PerfettoJavaHeapStackProf in the zygote + parseRuntimeOption("dalvik.vm.perfetto_javaheap", perfettoJavaHeapStackOptBuf, + "-XX:PerfettoJavaHeapStackProf=", "true"); + if (primary_zygote) { addOption("-Xprimaryzygote"); } |