commit d3e7c6c76f564b58e66010c30b62bb56ef046f2c
author Calin Juravle <calin@google.com> Thu Feb 04 19:07:51 2016 +0000
committer Calin Juravle <calin@google.com> Thu Feb 04 19:07:51 2016 +0000
tree bc67f7f152bf1786fbad6f15390e3dec4149a659
parent a20748aceb63396c5e09366968bbc71308f745df

Don't use native bridge for non zygote-spawn processes

... unless we force it for testing purposes.

Bug: 26954924
Change-Id: Ib4660a35175abb479d0399e18b6194eb04dbc248

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 0c06ca6..d5f22ef 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -602,9 +602,12 @@
     if (is_native_bridge_loaded_) {
       PreInitializeNativeBridge(".");
     }
+    NativeBridgeAction action = force_native_bridge_
+        ? NativeBridgeAction::kInitialize
+        : NativeBridgeAction::kUnload;
     InitNonZygoteOrPostFork(self->GetJniEnv(),
                             /* is_system_server */ false,
-                            NativeBridgeAction::kInitialize,
+                            action,
                             GetInstructionSetString(kRuntimeISA));
   }
 
@@ -939,6 +942,7 @@
   allow_dex_file_fallback_ = !runtime_options.Exists(Opt::NoDexFileFallback);
 
   no_sig_chain_ = runtime_options.Exists(Opt::NoSigChain);
+  force_native_bridge_ = runtime_options.Exists(Opt::ForceNativeBridge);
 
   Split(runtime_options.GetOrDefault(Opt::CpuAbiList), ',', &cpu_abilist_);