diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 00:04:30 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 00:04:30 +0000 |
| commit | b7aba8c3f7d9aa202eb9728a6cdc9f9fcabde704 (patch) | |
| tree | a99855beaefc8fc64eecc03afa588e4b676c111c /build | |
| parent | fb325d125715eb0ad19bfe964d2b9ef7e4f4afb3 (diff) | |
| download | chromium_src-b7aba8c3f7d9aa202eb9728a6cdc9f9fcabde704.zip chromium_src-b7aba8c3f7d9aa202eb9728a6cdc9f9fcabde704.tar.gz chromium_src-b7aba8c3f7d9aa202eb9728a6cdc9f9fcabde704.tar.bz2 | |
Beginnings of moving more stuff from build_sdk.py to GYP.
Adds a new target to all.gyp: chromium_builder_nacl_sdk
Adds a native_client_sdk gyp file: it depends on nacl_core_sdk from the
native_client repo, but also builds and copies ppapi libraries to the toolchain
directories.
Retry of http://codereview.chromium.org/11299081/.
Which was a retry of http://codereview.chromium.org/11363045/.
Failed both times because of a separate NaCl build issue that was resolved by
http://crrev.com/168621.
BUG=none
TBR=noelallen@chromium.org
Review URL: https://codereview.chromium.org/11413075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index bcbb259..b2bc5c7 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -350,6 +350,21 @@ '../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter', ], }, # target_name: chromium_builder_webrtc + { + 'target_name': 'chromium_builder_nacl_sdk', + 'type': 'none', + 'dependencies': [ + '../chrome/chrome.gyp:chrome', + '../native_client_sdk/src/build_tools/nacl_ppapi_sdk.gyp:*', + ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../chrome/chrome.gyp:chrome_nacl_win64', + ], + }], + ], + }, # target_name: chromium_builder_nacl_sdk ], # targets }], ['OS=="mac"', { |