mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 765734, part 0.1: Gecko subprocesses on Gonk want propdb too. r=mwu
--HG-- extra : rebase_source : dc881f7d75698ebab6e0a576e912af4f543b00a6
This commit is contained in:
parent
ce0178a04b
commit
98149930c3
@ -44,7 +44,7 @@
|
||||
using mozilla::MonitorAutoLock;
|
||||
using mozilla::ipc::GeckoChildProcessHost;
|
||||
|
||||
#ifdef MOZ_WIDGET_ANDROID
|
||||
#ifdef ANDROID
|
||||
// Like its predecessor in nsExceptionHandler.cpp, this is
|
||||
// the magic number of a file descriptor remapping we must
|
||||
// preserve for the child process.
|
||||
@ -476,7 +476,9 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
|
||||
// fill the last arg with something if there's no cache
|
||||
if (cacheStr.IsEmpty())
|
||||
cacheStr.AppendLiteral("-");
|
||||
#endif // MOZ_WIDGET_ANDROID
|
||||
|
||||
#ifdef ANDROID
|
||||
// Remap the Android property workspace to a well-known int,
|
||||
// and update the environment to reflect the new value for the
|
||||
// child process.
|
||||
@ -491,7 +493,7 @@ GeckoChildProcessHost::PerformAsyncLaunchInternal(std::vector<std::string>& aExt
|
||||
snprintf(buf, sizeof(buf), "%d%s", kMagicAndroidSystemPropFd, szptr);
|
||||
newEnvVars["ANDROID_PROPERTY_WORKSPACE"] = buf;
|
||||
}
|
||||
#endif // MOZ_WIDGET_ANDROID
|
||||
#endif // ANDROID
|
||||
|
||||
// remap the IPC socket fd to a well-known int, as the OS does for
|
||||
// STDOUT_FILENO, for example
|
||||
|
Loading…
Reference in New Issue
Block a user