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

Merge "Fix the logic of parsing profilebootclasspath flags."

Browse Source
This commit is contained in:
Treehugger Robot
2022-11-10 19:17:24 +00:00
committed by Gerrit Code Review
parent 66e5f1dac2 b3c55fcf55
commit f84d9caba4
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/jni/AndroidRuntime.cpp
View File

@@ -19,6 +19,7 @@
#define LOG_NDEBUG 1 #define LOG_NDEBUG 1
#include <android-base/macros.h> #include <android-base/macros.h>
#include <android-base/parsebool.h>
#include <android-base/properties.h> #include <android-base/properties.h>
#include <android/graphics/jni_runtime.h> #include <android/graphics/jni_runtime.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
@@ -52,6 +53,8 @@
using namespace android; using namespace android;
using android::base::GetBoolProperty; using android::base::GetBoolProperty;
using android::base::GetProperty; using android::base::GetProperty;
using android::base::ParseBool;
using android::base::ParseBoolResult;
extern int register_android_os_Binder(JNIEnv* env); extern int register_android_os_Binder(JNIEnv* env);
extern int register_android_os_Process(JNIEnv* env); extern int register_android_os_Process(JNIEnv* env);
@@ -701,17 +704,24 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv, bool zygote, bool p
// Read if we are using the profile configuration, do this at the start since the last ART args // Read if we are using the profile configuration, do this at the start since the last ART args
// take precedence. // take precedence.
property_get("dalvik.vm.profilebootclasspath", propBuf, ""); std::string profile_boot_class_path_flag =
std::string profile_boot_class_path_flag = propBuf; server_configurable_flags::GetServerConfigurableFlag(RUNTIME_NATIVE_BOOT_NAMESPACE,
// Empty means the property is unset and we should default to the phenotype property.
// The possible values are {"true", "false", ""}
if (profile_boot_class_path_flag.empty()) {
profile_boot_class_path_flag = server_configurable_flags::GetServerConfigurableFlag(
RUNTIME_NATIVE_BOOT_NAMESPACE,
PROFILE_BOOT_CLASS_PATH, PROFILE_BOOT_CLASS_PATH,
/*default_value=*/""); /*default_value=*/"");
bool profile_boot_class_path;
switch (ParseBool(profile_boot_class_path_flag)) {
case ParseBoolResult::kError:
// Default to the system property.
profile_boot_class_path =
GetBoolProperty("dalvik.vm.profilebootclasspath", /*default_value=*/false);
break;
case ParseBoolResult::kTrue:
profile_boot_class_path = true;
break;
case ParseBoolResult::kFalse:
profile_boot_class_path = false;
break;
} }
const bool profile_boot_class_path = (profile_boot_class_path_flag == "true");
if (profile_boot_class_path) { if (profile_boot_class_path) {
addOption("-Xcompiler-option"); addOption("-Xcompiler-option");
addOption("--count-hotness-in-compiled-code"); addOption("--count-hotness-in-compiled-code");