Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Read "gctype" flag from namespace "runtime_native_boot"."

Browse Source 
am: 14a5cedfb5

Change-Id: Ic287ada0c1875d35c15a26455c05f75ceeb7c63a
This commit is contained in:
Nicolas Geoffray
2019-02-26 01:16:13 -08:00
committed by android-build-merger
parent dc90eebeac 14a5cedfb5
commit 396fbedfd4
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/jni/AndroidRuntime.cpp
View File

@@ -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:");