diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-17 19:39:42 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-17 19:39:42 +0000 |
| commit | ea47b6a802638fa18df618d5ba71dc4b5b3b4c48 (patch) | |
| tree | 6c1cc5a5aac4c5c8dd81fbee7b2f87652ab1b823 /gpu | |
| parent | 48c18de8a9e3a35f5a829e7fb01e76d80e5b596e (diff) | |
| download | chromium_src-ea47b6a802638fa18df618d5ba71dc4b5b3b4c48.zip chromium_src-ea47b6a802638fa18df618d5ba71dc4b5b3b4c48.tar.gz chromium_src-ea47b6a802638fa18df618d5ba71dc4b5b3b4c48.tar.bz2 | |
Introduce ui.dll / libui.so for the component build.
R=ben@chromium.org
Review URL: http://codereview.chromium.org/7328011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/demos/demos.gyp | 2 | ||||
| -rw-r--r-- | gpu/gles2_conform_support/gles2_conform_support.gyp | 1 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index d257304..26d2230 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -42,6 +42,8 @@ '../gpu.gyp:command_buffer_client', '../gpu.gyp:command_buffer_service', '../../base/base.gyp:base', + '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../../ui/ui.gyp:ui', ], 'sources': [ 'framework/main_exe.cc', diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index a3493e3..d75462b 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -72,6 +72,7 @@ 'type': 'executable', 'dependencies': [ 'egl_native', + '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib_nocheck', '<(DEPTH)/third_party/expat/expat.gyp:expat', ], diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index acbee7f..22f0215 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -186,7 +186,7 @@ '../base/base.gyp:base', '../ui/gfx/gl/gl.gyp:gl', '../ui/gfx/surface/surface.gyp:surface', - '../ui/ui.gyp:ui_gfx', + '../ui/ui.gyp:ui', '../third_party/angle/src/build_angle.gyp:translator_glsl', ], 'sources': [ @@ -254,6 +254,7 @@ 'target_name': 'gpu_unittests', 'type': 'executable', 'dependencies': [ + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../testing/gmock.gyp:gmock', '../testing/gmock.gyp:gmock_main', '../testing/gtest.gyp:gtest', @@ -371,6 +372,7 @@ 'target_name': 'gles2_demo', 'type': 'executable', 'dependencies': [ + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', 'command_buffer_service', 'gles2_demo_lib', ], |