Chromium NaCl scripts now uses package_version to extract.

Chromium NaCl scripts now uses package_version to extract.

Updates NaCl revision from 13106 -> 13115

This CL reverts revision 266284.

Now that we have split up the toolchain into multiple tars, we should
use the package versioning script to manage which tars to extract.
Unfortunately, currently the SDK uses different directory names compared
to what the NaCl toolchain directories normally use, so we also must map
and move the toolchain directories to the SDK ones.

BUG=https://code.google.com/p/nativeclient/issues/detail?id=3839

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=267711

[David Yen, 2014-05-01 15:20:30]

Here are the chromium side changes once more to bring in the package_version
changes. Once the NaCl side changes lands I will update the NaCl DEPS rev and
start the trybots.

[David Yen, 2014-05-01 17:36:09]

The NaCl changes have landed (revision 13115), I have rolled the DEPS to that
revision now.

[David Yen, 2014-05-01 22:24:35]

All of the trybot results look okay, I think we are ready to land this into
chromium?

[bradn, 2014-05-01 22:25:37]

lgtm

[bradnelson, 2014-05-01 22:25:46]

lgtm

[David Yen, 2014-05-01 22:26:14]

The CQ bit was checked by dyen@chromium.org

[commit-bot: I haz the power, 2014-05-01 22:28:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dyen@chromium.org/261773002/20001

[commit-bot: I haz the power, 2014-05-02 01:04:03]

Change committed as 267711

[jvoung - send to chromium..., 2014-05-02 15:49:15]

https://codereview.chromium.org/261773002/diff/20001/build/download_nacl_tool...
File build/download_nacl_toolchains.py (right):

https://codereview.chromium.org/261773002/diff/20001/build/download_nacl_tool...
build/download_nacl_toolchains.py:54: package_version.main(args)
I don't know if someone's mentioned this already or not, but the main waterfall
IOS builders seem to be attempting to download:

http://build.chromium.org/p/chromium.mac/builders/iOS%20Device%20%28ninja%29/...

python ../../../scripts/slave/runhooks_wrapper.py
 in dir /b/build/slave/iOS_Device__ninja_/build (timeout 600 secs) (maxTime
28800 secs)
 watching logfiles {}
 argv: ['python', '../../../scripts/slave/runhooks_wrapper.py']
 environment:
  AWS_CREDENTIAL_FILE=/b/build/site_config/.boto
  BOTO_CONFIG=/b/build/site_config/.boto
  CHROME_HEADLESS=1
  CHROMIUM_GYP_SYNTAX_CHECK=1
  DEPOT_TOOLS_UPDATE=0
  GYP_CROSSCOMPILE=1
  GYP_DEFINES=component=static_library OS=ios target_subarch=both
  GYP_GENERATORS=ninja
  GYP_GENERATOR_FLAGS=
  HOME=/Users/chrome-bot
  LANDMINES_VERBOSE=1
  LOGNAME=chrome-bot
  PAGER=cat
 
PATH=/Users/chrome-bot/slavebin:/b/depot_tools:/usr/local/git/bin:/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
  PWD=/b/build/slave/iOS_Device__ninja_/build
 
PYTHONPATH=/b/build/site_config:/b/build/scripts:/b/build/scripts/release:/b/build/third_party:/b/build_internal/site_config:/b/build_internal/symsrc:/b/build/slave:/b/build/third_party/buildbot_slave_8_4:/b/build/third_party/twisted_10_2:
  SHELL=/bin/bash
  SSH_AUTH_SOCK=/tmp/launch-yVpumu/Listeners
  USER=chrome-bot
 using PTY: False

gclient runhooks

________ running
'/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/python
src/build/download_nacl_toolchains.py --exclude arm_trusted' in
'/b/build/slave/iOS_Device__ninja_/build'
Error: Command
/Library/Frameworks/Python.framework/Versions/2.7/Resources/Python.app/Contents/MacOS/python
src/build/download_nacl_toolchains.py --exclude arm_trusted returned non-zero
exit status 1 in /b/build/slave/iOS_Device__ninja_/build
Traceback (most recent call last):
  File "src/build/download_nacl_toolchains.py", line 59, in <module>
    sys.exit(Main(sys.argv[1:]))
  File "src/build/download_nacl_toolchains.py", line 54, in Main
    package_version.main(args)
  File
"/b/build/slave/iOS_Device__ninja_/build/src/native_client/build/package_version/package_version.py",
line 892, in main
    return COMMANDS[arguments.command].do_cmd_func(arguments)
  File
"/b/build/slave/iOS_Device__ninja_/build/src/native_client/build/package_version/package_version.py",
line 634, in _DoSyncCmd
    revision_file)
  File
"/b/build/slave/iOS_Device__ninja_/build/src/native_client/build/package_version/revision_info.py",
line 43, in __init__
    self.LoadRevisionFile(revision_file)
  File
"/b/build/slave/iOS_Device__ninja_/build/src/native_client/build/package_version/revision_info.py",
line 93, in LoadRevisionFile
    with open(revision_file, 'rt') as f:
IOError: [Errno 2] No such file or directory:
u'/b/build/slave/iOS_Device__ninja_/build/src/native_client/toolchain_revisions/nacl_x86_glibc.json'
program finished with exit code 2
elapsedTime=1.991995


I thought IOS builds would have disable_nacl=1 and skip out early, but it looks
like that's not the case... Did it used to skip downloads via a different
mechanism or ?