diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 06:18:34 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 06:18:34 +0000 |
| commit | 4663313ded549563bebe1c734091cac891e3786d (patch) | |
| tree | d5b765b814fc830811f5feb53b5075c5b215291e | |
| parent | 3cbfb9958be83d592ba2116c20c761d52bcf9696 (diff) | |
| download | chromium_src-4663313ded549563bebe1c734091cac891e3786d.zip chromium_src-4663313ded549563bebe1c734091cac891e3786d.tar.gz chromium_src-4663313ded549563bebe1c734091cac891e3786d.tar.bz2 | |
Pulling new nacl into chrome, which now uses a single ppapi copy.
BUG=http://code.google.com/p/chromium/issues/detail?id=93520
TEST=None
R=noelallen@google.com
Review URL: http://codereview.chromium.org/7750001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98190 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 8 | ||||
| -rwxr-xr-x | chrome/build_nacl_irt.py | 7 | ||||
| -rw-r--r-- | chrome/nacl.gypi | 2 |
3 files changed, 9 insertions, 8 deletions
@@ -7,12 +7,11 @@ vars = { "webkit_revision": "93705", "chromium_git": "http://git.chromium.org/git", "swig_revision": "69281", - "nacl_revision": "6499", + "nacl_revision": "6539", # After changing nacl_revision, run 'glient sync' and check native_client/DEPS # to update other nacl_*_revision's. # TODO(brettw) We should use the "From" syntax to avoid hardcoding the # revisions here, but it makes checkdeps confused. We should fix checkdeps. - "nacl_chrome_ppapi_revision": "97134", # native_client/DEPS: chrome_ppapi_rev "nacl_tools_revision": "5360", # native_client/DEPS: tools_rev # These hashes need to be updated when nacl_toolchain_revision is changed. @@ -102,11 +101,6 @@ deps = { "src/native_client": Var("nacl_trunk") + "/src/native_client@" + Var("nacl_revision"), - "src/native_client/src/third_party/ppapi": - # TODO(brettw) enable the From() line instead when checkdeps is fixed. - #From("src/native_client", "native_client/src/third_party/ppapi"), - "/trunk/src/ppapi@" + Var("nacl_chrome_ppapi_revision"), - "src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin": Var("nacl_trunk") + "/src/native_client/tests/prebuilt@" + Var("nacl_revision"), diff --git a/chrome/build_nacl_irt.py b/chrome/build_nacl_irt.py index 501865b..cee7655 100755 --- a/chrome/build_nacl_irt.py +++ b/chrome/build_nacl_irt.py @@ -21,6 +21,9 @@ NACL_CMD_BUFFER_DIR = os.path.join('src', 'shared', 'ppapi_proxy', 'command_buffer') GPU_CMD_BUFFER_DIR = os.path.join('..', 'gpu', 'command_buffer') +# Pathing to mirror of nacl tree in ppapi. +PPAPI_NACL_DIR = os.path.join(SRC_DIR, 'ppapi', 'native_client') + def RelativePath(path, base): """Find the relative path. @@ -94,6 +97,10 @@ def PrintInputs(platforms): # Apply the underlay of gpu/command_buffer (to match scons). if filename.startswith(NACL_CMD_BUFFER_DIR + os.sep): filename = GPU_CMD_BUFFER_DIR + filename[len(NACL_CMD_BUFFER_DIR):] + # Apply the underlay of ppapi (to match scons). + if (not os.path.exists(os.path.join(NACL_DIR, filename)) and + os.path.exists(os.path.join(PPAPI_NACL_DIR, filename))): + filename = '../ppapi/native_client/' + filename inputs.add(filename) # Check that everything exists and make it script relative. # Exclude things above SRC_DIR. diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index 03ce8aa..a6d6375 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -73,7 +73,7 @@ 'chrome_strings', 'common', '../webkit/support/webkit_support.gyp:glue', - '../native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome', + '../ppapi/native_client/src/trusted/plugin/plugin.gyp:ppGoogleNaClPluginChrome', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib', ], |