diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2019-02-26 02:06:31 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-26 02:06:31 -0800 |
| commit | a1efcbfd95ad78ba1ee8b9cbc12b425f49fd61ec (patch) | |
| tree | dca1fc848553f4bbbc6ae1a22ebf301ac3102287 /core/jni/AndroidRuntime.cpp | |
| parent | 2b626c790637feb99bbcaec24390bf9645ba88be (diff) | |
| parent | 396fbedfd4c3468f9c807c8255ac7c05e896be5a (diff) | |
Merge "Read "gctype" flag from namespace "runtime_native_boot"." am: 14a5cedfb5
am: 396fbedfd4
Change-Id: I44e4d24549c52fa27496c1f1f653dd2296e60ce4
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 55fb27e8d57c..815b9631ff79 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -220,6 +220,11 @@ extern int register_com_android_internal_os_Zygote(JNIEnv *env); extern int register_com_android_internal_os_ZygoteInit(JNIEnv *env); extern int register_com_android_internal_util_VirtualRefBasePtr(JNIEnv *env); +// Namespace for Android Runtime flags applied during boot time. +static const char* RUNTIME_NATIVE_BOOT_NAMESPACE = "runtime_native_boot"; +// Feature flag name for Garbage Collector type. +static const char* GCTYPE = "gctype"; + static AndroidRuntime* gCurRuntime = NULL; /* @@ -771,7 +776,9 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote) } std::string gc_type_override = - server_configurable_flags::GetServerConfigurableFlag("runtime_native", "gctype", ""); + server_configurable_flags::GetServerConfigurableFlag(RUNTIME_NATIVE_BOOT_NAMESPACE, + GCTYPE, + /*default_value=*/ ""); std::string gc_type_override_temp; if (gc_type_override.empty()) { parseRuntimeOption("dalvik.vm.gctype", gctypeOptsBuf, "-Xgc:"); |