diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2019-02-26 01:16:13 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-26 01:16:13 -0800 |
| commit | 396fbedfd4c3468f9c807c8255ac7c05e896be5a (patch) | |
| tree | f0032decc25ba8a0f5a032ec4989acfc258647ce /core/jni/AndroidRuntime.cpp | |
| parent | dc90eebeace63f5cb146499ae00757831bd25d59 (diff) | |
| parent | 14a5cedfb5c80826c1949ad9643cea7e8e14f6ee (diff) | |
Merge "Read "gctype" flag from namespace "runtime_native_boot"."
am: 14a5cedfb5
Change-Id: Ic287ada0c1875d35c15a26455c05f75ceeb7c63a
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:"); |