commit 449f0589c8c8572e32c57befee089123e9eea1ba
author Mathieu Chartier <mathieuc@google.com> Fri Mar 31 14:49:09 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Apr 03 09:59:56 2017 -0700
tree 1e3c91892e953dc6208511ae2297c77cbc9d858a
parent 5a3704e0911fa4ab56e9818949da3c64f0ab8192

Allow -Xjitsaveprofilinginfo for system server

setenforce 0 is still required to prevent selinux violations.

Test: adb shell setprop dalvik.vm.extra-opts "'-Xusejit:false -Xint -Xjitsaveprofilinginfo'" && adb shell start

Bug: 34927277
Bug: 36457259
Change-Id: I4d34b8662f596cb6d7a1ad0a2182ac88eb9bec41

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 44f8281..48efbe5 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -806,11 +806,11 @@
   // before fork aren't attributed to an app.
   heap_->ResetGcPerformanceInfo();
 
-
-  if (!is_system_server &&
+  // We may want to collect profiling samples for system server, but we never want to JIT there.
+  if ((!is_system_server || !jit_options_->UseJitCompilation()) &&
       !safe_mode_ &&
       (jit_options_->UseJitCompilation() || jit_options_->GetSaveProfilingInfo()) &&
-      jit_.get() == nullptr) {
+      jit_ == nullptr) {
     // Note that when running ART standalone (not zygote, nor zygote fork),
     // the jit may have already been created.
     CreateJit();