Revert "Inline across dex files for JIT."

Broke hikey build.

bug:30933338

This reverts commit f290c01c61f8a2979efa74ffcd2f54c5e426a3d0.

Change-Id: I3363d703c54d0f9b69197a29395cc08f60c8b2ac

1 files changed, 2 insertions, 5 deletions

diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 5ef9c4cd78..7772e8f973 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -1416,13 +1416,10 @@ bool HInliner::TryBuildAndInlineHelper(HInvoke* invoke_instruction,
         return false;
       }
 
-      if (current->NeedsEnvironment() &&
-          !CanEncodeInlinedMethodInStackMap(*caller_compilation_unit_.GetDexFile(),
-                                            resolved_method)) {
+      if (!same_dex_file && current->NeedsEnvironment()) {
         VLOG(compiler) << "Method " << callee_dex_file.PrettyMethod(method_index)
                        << " could not be inlined because " << current->DebugName()
-                       << " needs an environment, is in a different dex file"
-                       << ", and cannot be encoded in the stack maps.";
+                       << " needs an environment and is in a different dex file";
         return false;
       }