diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 14:53:32 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-07 14:53:32 +0000 |
| commit | ab6ce194c68e78f474ec39cdae6cb941fa9eb237 (patch) | |
| tree | c75f5aaec3d8f4e99592b3614fb9db9f85669356 /gpu/command_buffer/command_buffer.gyp | |
| parent | f5da7dc925e30fd5b28877ae74f134058bb0eff7 (diff) | |
| download | chromium_src-ab6ce194c68e78f474ec39cdae6cb941fa9eb237.zip chromium_src-ab6ce194c68e78f474ec39cdae6cb941fa9eb237.tar.gz chromium_src-ab6ce194c68e78f474ec39cdae6cb941fa9eb237.tar.bz2 | |
Add gpu targets to untrusted build, and add Graphics3D code to untrusted build.
BUG=116317
TEST=builds,manual
With this change, the IPC-based PPAPI proxy builds and runs the tumbler example.
Review URL: https://chromiumcodereview.appspot.com/10796038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/command_buffer.gyp')
| -rw-r--r-- | gpu/command_buffer/command_buffer.gyp | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/gpu/command_buffer/command_buffer.gyp b/gpu/command_buffer/command_buffer.gyp index dffac1c..7a4c10a 100644 --- a/gpu/command_buffer/command_buffer.gyp +++ b/gpu/command_buffer/command_buffer.gyp @@ -6,13 +6,16 @@ 'variables': { 'chromium_code': 1, }, + 'includes': [ + 'command_buffer.gypi', + ], 'targets': [ { 'target_name': 'gles2_utils', 'type': '<(component)', - 'include_dirs': [ - '<(DEPTH)/third_party/khronos', - ], + 'variables': { + 'gles2_utils_target': 1, + }, 'all_dependent_settings': { 'include_dirs': [ '<(DEPTH)/third_party/khronos', @@ -24,17 +27,6 @@ 'export_dependent_settings': [ '../../base/base.gyp:base', ], - 'defines': [ - 'GLES2_UTILS_IMPLEMENTATION', - ], - 'sources': [ - 'common/gles2_cmd_format.h', - 'common/gles2_cmd_utils.cc', - 'common/gles2_cmd_utils.h', - 'common/gles2_utils_export.h', - 'common/logging.cc', - 'common/logging.h', - ], }, ], } |