| commit | fea2f07f106ebcb718a736770be8d35dbf71a07a | [log] [tgz] |
|---|---|---|
| author | Sergey Ulanov <[email protected]> | Sat Oct 21 04:34:26 2017 |
| committer | Commit Bot <[email protected]> | Sat Oct 21 04:34:26 2017 |
| tree | a55d87391312d732cb9d74e359b2a2189fbdc9af | |
| parent | 39515fac2855ef8183f11f39766082c0bfefc6bb [diff] [blame] |
Roll Fuchsia SDK to 492eec9e40c9832dd8772f4718b7db6aac4d7921 In the new SDK: - NIC indices are 1-based now, which is useful for multicast UDP socket (for details see https://chromium-review.googlesource.com/c/chromium/src/+/729538) - LP_CLONE_FDIO_CWD was removed. [email protected] Bug: 707030, 768916 Change-Id: If282c06ea01e7ec5e8f77d312529340e35ecc868 Reviewed-on: https://chromium-review.googlesource.com/731671 Commit-Queue: Sergey Ulanov <[email protected]> Reviewed-by: Nico Weber <[email protected]> Reviewed-by: Wez <[email protected]> Reviewed-by: Sergey Ulanov <[email protected]> Reviewed-by: Kevin Marshall <[email protected]> Cr-Commit-Position: refs/heads/master@{#510660}
diff --git a/base/process/launch_fuchsia.cc b/base/process/launch_fuchsia.cc index 16ac513..b79210f 100644 --- a/base/process/launch_fuchsia.cc +++ b/base/process/launch_fuchsia.cc
@@ -11,6 +11,7 @@ #include <zircon/processargs.h> #include "base/command_line.h" +#include "base/files/file_util.h" #include "base/fuchsia/default_job.h" #include "base/logging.h" @@ -96,9 +97,10 @@ EnvironmentMap environ_modifications = options.environ; if (!options.current_directory.empty()) { environ_modifications["PWD"] = options.current_directory.value(); - - // Don't clone the parent's CWD if we are overriding the child's PWD. - to_clone = to_clone & ~LP_CLONE_FDIO_CWD; + } else { + FilePath cwd; + base::GetCurrentDirectory(&cwd); + environ_modifications["PWD"] = cwd.value(); } if (to_clone & LP_CLONE_DEFAULT_JOB) {