commit 9e73672362e2ed98ccfcc15695645daa42a61524
author Brian Carlstrom <bdc@google.com> Mon Mar 10 17:51:05 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 10 17:51:05 2014 +0000
tree ddbcb3c210bed87ebd7cb90194f4eda2a3e2ee22
parent 8272c84cb531a4f148f0b0a31d8359d381137378
parent ec4c7752c22ae26924378d953a6f4a0e8e8b036d

am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART"

* commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
  Only pass -Xprofile-* options to ART

core/jni/AndroidRuntime.cpp

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index e623d5d..98f7716 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -749,10 +749,11 @@
         mOptions.add(opt);
     }
 
-    // libart tolerates libdvm flags, but not vice versa, so only pass these if libart.
+    // libart tolerates libdvm flags, but not vice versa, so only pass some options if libart.
     property_get("persist.sys.dalvik.vm.lib.1", dalvikVmLibBuf, "libdvm.so");
-    if (strncmp(dalvikVmLibBuf, "libart", 6) == 0) {
+    bool libart = (strncmp(dalvikVmLibBuf, "libart", 6) == 0);
 
+    if (libart) {
         // Extra options for DexClassLoader.
         property_get("dalvik.vm.dex2oat-flags", dex2oatFlagsBuf, "");
         parseExtraOpts(dex2oatFlagsBuf, "-Xcompiler-option");
@@ -783,7 +784,7 @@
     /*
      * Set profiler options
      */
-    {
+    if (libart) {
       char period[sizeof("-Xprofile-period:") + PROPERTY_VALUE_MAX];
       char duration[sizeof("-Xprofile-duration:") + PROPERTY_VALUE_MAX];
       char interval[sizeof("-Xprofile-interval:") + PROPERTY_VALUE_MAX];