summaryrefslogtreecommitdiff
path: root/runtime/runtime.cc
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2019-10-28 13:34:03 -0700
committer Mathieu Chartier <mathieuc@google.com> 2019-11-04 23:42:59 +0000
commitccc75191d44f696c39262d3c774b2500d06bebb7 (patch)
tree4e30f0d47d916e2da7aebe1213c028d543095c79 /runtime/runtime.cc
parent5fd05e5cfd06c9e682d8b3a097bf0b30e2a85ed4 (diff)
Avoid making oat files executable for system server profiling
Done so that we will only use JIT + interpreter to get samples for services.jar. Bug: 139883463 Test: showmap `pid system_server` and verify Change-Id: I6f13446948fd92a43a9312988fd6e00ee4a0ed41
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r--runtime/runtime.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index b6b7501010..c6d9bfdf25 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -986,7 +986,6 @@ void Runtime::InitNonZygoteOrPostFork(
UnloadNativeBridge();
is_native_bridge_loaded_ = false;
break;
-
case NativeBridgeAction::kInitialize:
InitializeNativeBridge(env, isa);
break;
@@ -2965,4 +2964,8 @@ void Runtime::SetJniIdType(JniIdType t) {
WellKnownClasses::HandleJniIdTypeChange(Thread::Current()->GetJniEnv());
}
+bool Runtime::GetOatFilesExecutable() const {
+ return !IsAotCompiler() && !(IsSystemServer() && jit_options_->GetSaveProfilingInfo());
+}
+
} // namespace art