diff options
| author | jgu21 <jinghui.gu@intel.com> | 2014-09-10 06:57:17 -0400 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-09-23 20:11:31 -0700 |
| commit | a6da74e941d7cee498ac3880018a1d8dc953c6eb (patch) | |
| tree | bb36d90e914f8a842abd7dd854ba168f9441e8db /runtime/native | |
| parent | a20b7b3ecf90bb761d7085403782721f2fb474c5 (diff) | |
| download | art-a6da74e941d7cee498ac3880018a1d8dc953c6eb.zip art-a6da74e941d7cee498ac3880018a1d8dc953c6eb.tar.gz art-a6da74e941d7cee498ac3880018a1d8dc953c6eb.tar.bz2 | |
ART: Update for split native bridge initialization
Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
Diffstat (limited to 'runtime/native')
| -rw-r--r-- | runtime/native/dalvik_system_ZygoteHooks.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc index c3c8c25..e469126 100644 --- a/runtime/native/dalvik_system_ZygoteHooks.cc +++ b/runtime/native/dalvik_system_ZygoteHooks.cc @@ -111,15 +111,17 @@ static void ZygoteHooks_nativePostForkChild(JNIEnv* env, jclass, jlong token, ji thread->InitAfterFork(); EnableDebugFeatures(debug_flags); - Runtime::NativeBridgeAction action = Runtime::NativeBridgeAction::kUnload; if (instruction_set != nullptr) { ScopedUtfChars isa_string(env, instruction_set); InstructionSet isa = GetInstructionSetFromString(isa_string.c_str()); + Runtime::NativeBridgeAction action = Runtime::NativeBridgeAction::kUnload; if (isa != kNone && isa != kRuntimeISA) { action = Runtime::NativeBridgeAction::kInitialize; } + Runtime::Current()->DidForkFromZygote(env, action, isa_string.c_str()); + } else { + Runtime::Current()->DidForkFromZygote(env, Runtime::NativeBridgeAction::kUnload, nullptr); } - Runtime::Current()->DidForkFromZygote(action); } static JNINativeMethod gMethods[] = { |