commit e68c165c121c962f3f36a89f68aa66cc37ec8eaa
author Andreas Gampe <agampe@google.com> Tue Mar 10 18:38:43 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 10 18:38:43 2015 +0000
tree 2253a9042ba5741cdb589f9f1f1cfa421f3caf3c
parent 454c15907f9c00b0422356d9b4fa620b1736b572
parent 21c7906e08b801f1afcb62bdd1f1763c93e5ea06

am 21c7906e: Merge "ART: Relax test 703"

* commit '21c7906e08b801f1afcb62bdd1f1763c93e5ea06':
  ART: Relax test 703

runtime/asm_support.h

diff --git a/runtime/asm_support.h b/runtime/asm_support.h
index ee70fe7..92f4ebe 100644
--- a/runtime/asm_support.h
+++ b/runtime/asm_support.h
@@ -39,7 +39,7 @@
 // impacts where samples will occur. Reducing the count as much as possible improves profiler
 // accuracy in tools like traceview.
 // TODO: get a compiler that can do a proper job of loop optimization and remove this.
-#define SUSPEND_CHECK_INTERVAL 1000
+#define SUSPEND_CHECK_INTERVAL 96
 #endif
 
 #if defined(__cplusplus)

runtime/jni_internal.cc

diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc
index 898a363..6063e1e 100644
--- a/runtime/jni_internal.cc
+++ b/runtime/jni_internal.cc
@@ -45,7 +45,6 @@
 #include "mirror/object_array-inl.h"
 #include "mirror/string-inl.h"
 #include "mirror/throwable.h"
-#include "nativebridge/native_bridge.h"
 #include "parsed_options.h"
 #include "reflection.h"
 #include "runtime.h"