diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 01:18:24 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 01:18:24 +0000 |
| commit | 3fa3f672d60439d5212afbe1618de9a6c0a8360b (patch) | |
| tree | 2cb1e8295c21aab70188f4365a3e124816dcae3f /gpu | |
| parent | 2f399395e09bbe0872a1fea9f9e3de7efdfaf1ed (diff) | |
| download | chromium_src-3fa3f672d60439d5212afbe1618de9a6c0a8360b.zip chromium_src-3fa3f672d60439d5212afbe1618de9a6c0a8360b.tar.gz chromium_src-3fa3f672d60439d5212afbe1618de9a6c0a8360b.tar.bz2 | |
Base: Adjust dependencies to build with base.dll
BUG=76996
TEST=none
Review URL: http://codereview.chromium.org/6883205
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/demos/demos.gyp | 3 | ||||
| -rw-r--r-- | gpu/gpu.gyp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gpu/demos/demos.gyp b/gpu/demos/demos.gyp index 2e2ead0..a228d56 100644 --- a/gpu/demos/demos.gyp +++ b/gpu/demos/demos.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -41,6 +41,7 @@ 'gpu_demo_framework', '../gpu.gyp:command_buffer_client', '../gpu.gyp:command_buffer_service', + '../../base/base.gyp:base', ], 'sources': [ 'framework/main_exe.cc', diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 6a6f6ff..7faead9 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -29,6 +29,7 @@ 'type': 'static_library', 'dependencies': [ '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', ], 'include_dirs': [ '..', |