summaryrefslogtreecommitdiff
path: root/runtime/native_bridge_art_interface.cc
diff options
context:
space:
mode:
author Lev Rumyantsev <levarum@google.com> 2019-12-13 15:49:37 -0800
committer Lev Rumyantsev <levarum@google.com> 2020-01-21 23:09:34 +0000
commitabafbe759a354dd6c6d81d4aba3f0aec9aca3d5b (patch)
treeabd0c540ee97708916450c07bc37d4cd5229a902 /runtime/native_bridge_art_interface.cc
parent7ec3e60dd656509f4346fc94968f9de22cedcaaf (diff)
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
Diffstat (limited to 'runtime/native_bridge_art_interface.cc')
-rw-r--r--runtime/native_bridge_art_interface.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/native_bridge_art_interface.cc b/runtime/native_bridge_art_interface.cc
index 9287536ae6..0651f0ca6a 100644
--- a/runtime/native_bridge_art_interface.cc
+++ b/runtime/native_bridge_art_interface.cc
@@ -110,6 +110,10 @@ void PreInitializeNativeBridge(const std::string& dir) {
#endif
}
+void PreZygoteForkNativeBridge() {
+ android::PreZygoteForkNativeBridge();
+}
+
void InitializeNativeBridge(JNIEnv* env, const char* instruction_set) {
if (android::NativeBridgeInitialized()) {
// This happens in apps forked from app-zygote, since native bridge