GitLab

Revert of NaCl: Update revision in DEPS, 546ef11 -> b6ec17d (patchset #2 id:20001 of https://codereview.chromium.org/1460063003/ )

Reason for revert:
I'm speculatively reverting this CL as the cause for the failing Mac10.6 Tests nacl_integration test. The whole test fails with this output:
scons: done reading SConscript files.
scons: Building targets ...
Install file: "src/untrusted/pthread/pthread.h" as "scons-out/nacl-x86-64/include/pthread.h"
Install file: "src/untrusted/pthread/semaphore.h" as "scons-out/nacl-x86-64/include/semaphore.h"
Install file: "src/untrusted/stubs/crt1.x" as "scons-out/nacl-x86-64/obj/src/untrusted/stubs/crt1.o"
Func(["scons-out/nacl-x86-64/obj/tests/breakpad_crash_test/breakpad_untrusted_crash_test.out.tmp/crash_test.nmf"], [])
Install file: "src/untrusted/nacl/nacl_random.h" as "scons-out/nacl-x86-64/include/nacl/nacl_random.h"
Install file: "src/untrusted/nacl/nacl_dyncode.h" as "scons-out/nacl-x86-64/include/nacl/nacl_dyncode.h"
WriteManifestList(["scons-out/nacl_irt_test-x86-64/obj/tests/nacl_browser/inbrowser_test_runner/run_inbrowser_test_runner_nmf_test_list.js"], [])
Func(["scons-out/nacl_irt_test-x86-64/obj/tests/nacl_browser/inbrowser_test_runner/run_inbrowser_test_runner.out.tmp/random_test.nmf"], [])
Install file: "scons-out/nacl-x86-64/obj/src/untrusted/stubs/crt1.o" as "scons-out/nacl-x86-64/lib/crt1.o"
/Volumes/data/b/build/slave/Mac10_6_Tests/build/src/native_client/toolchain/mac_x86/pnacl_newlib/bin/x86_64-nacl-clang -m64 -std=gnu99 -O2 -g -fomit-frame-pointer -fasynchronous-unwind-tables -Wall -Wundef -fdiagnostics-show-option -Werror -Wno-variadic-macros -Wno-language-extension-token -integrated-as -D__STDC_LIMIT_MACROS=1 -D__STDC_FORMAT_MACROS=1 -D_GNU_SOURCE=1 -D_POSIX_C_SOURCE=199506 -D_XOPEN_SOURCE=600 -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DDYNAMIC_ANNOTATIONS_PREFIX=NACL_ -DNACL_BUILD_ARCH=x86 -DNACL_BUILD_SUBARCH=64 -Iscons-out/nacl-x86-64/include -I/Volumes/data/b/build/slave/Mac10_6_Tests/build/src/ppapi/native_client/scons-out/nacl-x86-64/include -I/Volumes/data/b/build/slave/Mac10_6_Tests/build/src -I/Volumes/data/b/build/slave/Mac10_6_Tests/build/src/ppapi -c -o scons-out/nacl-x86-64/obj/src/untrusted/nacl/sigprocmask.o src/untrusted/nacl/sigprocmask.c
dyld: Library not loaded: /usr/lib/libedit.3.dylib
  Referenced from: /Volumes/data/b/build/slave/Mac10_6_Tests/build/src/native_client/toolchain/mac_x86/pnacl_newlib/bin/x86_64-nacl-clang
  Reason: image not found

I'm thinking this might be caused by "Fix PNaCl toolchain build on Mac" https://codereview.chromium.org/1458713003
that e.g. includes this change:
# Required SDK version and target version for Mac builds.
# See MAC_SDK_FLAGS, below.
MAC_SDK_MIN = '10.10'
MAC_DEPLOYMENT_TARGET = '10.6'

Original issue's description:
> NaCl: Update revision in DEPS, 546ef11 -> b6ec17d
>
> This pulls in the following Native Client changes:
>
> 1a71811: (stichnot@chromium.org) PNaCl: Update subzero revision in pnacl/COMPONENT_REVISIONS
> 26a11d1: (stichnot@chromium.org) Update revision for PNaCl
> 3658d8e: (phosek@chromium.org) PNaCl: Update clang revision in pnacl/COMPONENT_REVISIONS
> 7a60f36: (mcgrathr@chromium.org) Remove an unused variable from src/shared/imc/win/nacl_imc.cc
> 1b746e8: (mcgrathr@chromium.org) PNaCl: Update clang revision in pnacl/COMPONENT_REVISIONS
> 0f0cb21: (mcgrathr@chromium.org) pnacl-strip: Handle --strip-unneeded switch
> 9d811a5: (mcgrathr@chromium.org) toolchain_build: Disable gold build for Mac host
> 7f130ff: (erikchen@chromium.org) Suppress Clang warning for dirfd() on OSX.
> 18e2d27: (erikchen@chromium.org) Add code to check for the OS X version.
> bad8503: (erikchen@chromium.org) Fix an invocation to find_sdk.py.
> 079650c: (stichnot@chromium.org) PNaCl: Update subzero revision in pnacl/COMPONENT_REVISIONS
> 4dbae34: (mcgrathr@chromium.org) Fix PNaCl toolchain build on Mac
> db88d57: (mcgrathr@chromium.org) Fix build/update_pnacl_tool_revisions.py for @-less user names
> d5112f1: (mcgrathr@chromium.org) Update revision for PNaCl
> b6ec17d: (erikchen@chromium.org) Make a NaCl descriptor for Mach-based shared memory.
>
> Changes: https://chromium.googlesource.com/native_client/src/native_client/+log/546ef11ffcbedf8c33bfa12643408c1182b6839e..b6ec17db8c2958f3455043e29000f17354336fb8
>
> BUG=none
> TEST=browser_tests and nacl_integration
> CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_chromium_dbg_32_ng,linux_arm_compile,linux_nacl_sdk_build
>
> Committed: https://crrev.com/910bd999c1fed7f0211b636184072f35a506023f
> Cr-Commit-Position: refs/heads/master@{#360958}

TBR=dpranke@chromium.org,dschuff@chromium.org,mcgrathr@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
BUG=none

Review URL: https://codereview.chromium.org/1472713003

Cr-Commit-Position: refs/heads/master@{#361096}