diff options
| author | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 00:11:21 +0000 |
|---|---|---|
| committer | gregoryd@google.com <gregoryd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 00:11:21 +0000 |
| commit | a433400d51e1fcaa6a21a2f8e594896109a71c14 (patch) | |
| tree | 8694f0691bc28d958eab96b04b96338edb2199af /chrome | |
| parent | 0108cbee8d7ea94e97eac5092302b469a61a25d0 (diff) | |
| download | chromium_src-a433400d51e1fcaa6a21a2f8e594896109a71c14.zip chromium_src-a433400d51e1fcaa6a21a2f8e594896109a71c14.tar.gz chromium_src-a433400d51e1fcaa6a21a2f8e594896109a71c14.tar.bz2 | |
Merging Native Client gyp files - get the changes from NaCl revision 852
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/271076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28919 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rwxr-xr-x | chrome/chrome.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9afac637..8ab5b39 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -3032,7 +3032,7 @@ 'chrome_strings', '../third_party/npapi/npapi.gyp:npapi', '../webkit/webkit.gyp:glue', - '../native_client/src/trusted/plugin/plugin_chrome.gyp:npGoogleNaClPluginChrome', + '../native_client/src/trusted/plugin/plugin.gyp:npGoogleNaClPluginChrome', '../native_client/src/trusted/service_runtime/service_runtime.gyp:sel', '../native_client/src/trusted/validator_x86/validator_x86.gyp:ncvalidate', '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib', |