commit abafbe759a354dd6c6d81d4aba3f0aec9aca3d5b
author Lev Rumyantsev <levarum@google.com> Fri Dec 13 15:49:37 2019 -0800
committer Lev Rumyantsev <levarum@google.com> Tue Jan 21 23:09:34 2020 +0000
tree abd0c540ee97708916450c07bc37d4cd5229a902
parent 7ec3e60dd656509f4346fc94968f9de22cedcaaf

nativebridge: Add PreZygoteFork callback

It's required to clean-up the emulated enviroment (e.g. close file
descriptors) after emulated execution in doPreload() in app-zygote.

Test: NativeBridge6PreZygoteFork_test
Test: CtsSeccompHostTestCases
android.seccomp.cts.SeccompHostJUnit4DeviceTest
testAppZygoteSyscalls
both for Q.sdk_gphone_x86_arm.armeabi-v7a
Bug: 146904103

Change-Id: Id192a1647c2f405570bf196daf65b3f2a9faca42

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 0dc93c3..fa1916a 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -688,6 +688,7 @@
     GetJit()->PreZygoteFork();
   }
   heap_->PreZygoteFork();
+  PreZygoteForkNativeBridge();
 }
 
 void Runtime::PostZygoteFork() {