diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 21:27:45 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 21:27:45 +0000 |
| commit | 12d5e6f7f3ddcea740268d5d9a2b944d9126047e (patch) | |
| tree | ed0075e8426da77d02031dfebf4b415409b63136 /gpu | |
| parent | f957987f588a4be089083d4ed24446f4f6bbd7d1 (diff) | |
| download | chromium_src-12d5e6f7f3ddcea740268d5d9a2b944d9126047e.zip chromium_src-12d5e6f7f3ddcea740268d5d9a2b944d9126047e.tar.gz chromium_src-12d5e6f7f3ddcea740268d5d9a2b944d9126047e.tar.bz2 | |
Make NaCl IPC-based PPAPI proxy build on ARM.
This change modifies the build to fix compile and link failures. It introduces a build/common_untrusted.gypi file, to add things that are needed by all untrusted targets that build Chrome code.
BUG=116317
TEST=compiles native_client.gyp:nacl_ipc_irt target on ARM.
Review URL: https://chromiumcodereview.appspot.com/10871009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/command_buffer_untrusted.gyp | 2 | ||||
| -rw-r--r-- | gpu/gpu_untrusted.gyp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer/command_buffer_untrusted.gyp b/gpu/command_buffer/command_buffer_untrusted.gyp index 25987e7..553af5a 100644 --- a/gpu/command_buffer/command_buffer_untrusted.gyp +++ b/gpu/command_buffer/command_buffer_untrusted.gyp @@ -7,7 +7,7 @@ 'chromium_code': 1, }, 'includes': [ - '../../native_client/build/untrusted.gypi', + '../../build/common_untrusted.gypi', 'command_buffer.gypi', ], 'conditions': [ diff --git a/gpu/gpu_untrusted.gyp b/gpu/gpu_untrusted.gyp index 33abfcd..e0efb8e 100644 --- a/gpu/gpu_untrusted.gyp +++ b/gpu/gpu_untrusted.gyp @@ -7,7 +7,7 @@ 'chromium_code': 1, }, 'includes': [ - '../native_client/build/untrusted.gypi', + '../build/common_untrusted.gypi', 'gpu_common.gypi', ], 'conditions': [ |