NaCl: Update revision in DEPS, r9652 -> r9707

(* r9670 seems to require a corresponding change in native_client.gyp)

This pulls in the following Native Client changes:

r9653: (shcherbina) Production validator hex tests: minor changes
r9654: (khim) Remove warnings supression from gen_dfa.cc
r9655: (dschuff) Cleanup for LLVM merge script and mergebot
r9656: (mseaborn) Debug stub: Refactor how we bind() a TCP port
r9657: (noelallen) Update the way we download, untar, and use the toolchains /w GYP
r9658: (jfb) ARM validator: branch_branch_with_link_and_block_data_transfer.
r9659: (dschuff) Fix archived frontend test to specify the x86-32 toolchain hash
r9660: (noelallen) Whitespace change to test build issues.
r9661: (noelallen) Fix call to attrib from cygtar.
r9662: (noelallen) Whitespace change to test build
r9663: (binji) Add nacl_sdk gyp meta-target.
r9664: (khim) Rollback of 9663
r9665: (khim) Fix style issues in dfa_validate_32.c/dfa_validate_64.c
r9666: (khim) C++11-to-C++03 conversion. Step 1: begin(xxx)->xxx.begin()
r9667: (bradnelson) Make cleanup more complete.
r9668: (bradnelson) Drop things that have moved chrome side.
r9669: (bradnelson) Drop line in all.gyp not caught due to trybots using patch.
*r9670: (bradnelson) Fixing call_on_main_thread references.
r9671: (noelallen) Check for URLError exception and retry.
r9672: (noelallen) Add verbosity to try and debug MAC
r9673: (bradnelson) Dropping several chrome side DEPS items.
r9675: (bradnelson) Dropping coverage dependency on ppapi.
r9677: (bradnelson) Dropping pnacl buildbot script reference to plugin.
r9678: (noelallen) Add verbosity to build_nexe to try and diagnose build issues
r9679: (noelallen) Add information on Copy command.
r9680: (noelallen) Fix Sconstruct change, bad args
r9681: (khim) Whitespace change in gen_dfa.cc
r9682: (noelallen) Change naclsdk.py site tool to chose only 32 bit pnacl toolchain.
r9683: (noelallen) Reapply change 9663
r9684: (bradnelson) Add ppapi back to the include order.
r9685: (shcherbina) Validator_ragel: add support for raw files in validator_test
r9686: (halyavin) Debug stub: Fix memory leak in debug stub connection loop
r9687: (khim) C++11-to-C++03 conversion. Step 22: auto/decltype
r9688: (dschuff) Build binutils with built-in zlib instead of system zlib
r9689: (bradnelson) Dropping pnacl build of irt shim.
r9690: (binji) Build ncval_x86_32 and ncval_x86_64 with gyp.
r9691: (bradnelson) Dropping nop chrome browser test invocations in pnacl build.
r9692: (dschuff) Disable zlib in binutils build only on linux (it fails on windows)
r9693: (dschuff) Also disable zlib during make only on linux
r9694: (mseaborn) Debug stub: Enable most non-GDB-using debug stub tests on Mac OS X
r9695: (halyavin) Remove error 5 retries since we don't have them for a week.
r9696: (mseaborn) Debug stub tests: Remove one use of the x86 int3 instruction
r9697: (mseaborn) Debug stub: Enable most GDB tests on Mac OS X
r9698: (dschuff) Update pnacl deps to 9693
r9699: (jvoung) Mark regressions in compile speed for x86-64.  LLVM codegen
r9700: (bradnelson) Revert 9678 - Add verbosity to build_nexe to try and diagnose build issues
r9701: (bradnelson) Print and ignore failures in cleanup during an exception.
r9702: (jvoung) Make pnacl toolchain tester bot find the right toolchain.
r9703: (bradnelson) Adding a cleanup attempt to download_toolchains.
r9704: (bradnelson) Move cleanup to before download.
r9705: (dschuff) Make pnacl 64-bit toolchain builder test 64 bit toolchain
r9706: (mseaborn) Debug stub tests: Remove use of int3 in single-stepping tests
r9707: (jvoung) Fix ARM toolchain tester w.r.t. finding the 32-bit vs freshly built 64-bit

BUG=none
TEST=nacl_integration

Review URL: https://chromiumcodereview.appspot.com/10909178

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156239 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 15 deletions

diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index 7ad7cac..8a94c3a 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -20,21 +20,20 @@
             '..',
           ],
           'copies': [
-            # TODO(bradnelson): Re-enable on nacl DEPS roll.
-            #{
-            #  'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include/nacl',
-            #  'files': [
-            #      'src/trusted/weak_ref/call_on_main_thread.h',
-            #      'src/shared/ppapi_proxy/ppruntime.h',
-            #  ],
-            #},
-            #{
-            #  'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include/nacl',
-            #  'files': [
-            #      'src/trusted/weak_ref/call_on_main_thread.h',
-            #      'src/shared/ppapi_proxy/ppruntime.h',
-            #  ],
-            #},
+            {
+              'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/include/nacl',
+              'files': [
+                'src/trusted/weak_ref/call_on_main_thread.h',
+                'src/shared/ppapi_proxy/ppruntime.h',
+              ],
+            },
+            {
+              'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/include/nacl',
+              'files': [
+                'src/trusted/weak_ref/call_on_main_thread.h',
+                'src/shared/ppapi_proxy/ppruntime.h',
+              ],
+            },
             # Here we copy linker scripts out of the Native Client repository.
             # These are source, not build artifacts.
             {