Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(679)

Side by Side Diff: webkit/webkit.gyp

Issue 206006: Force inclusion of build/common.gypi for all chromium gyp files. (Closed)
Patch Set: 2nd round of feedback Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« o3d/DEPS_gyp ('K') | « webkit/tools/test_shell/test_shell.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'feature_defines': [ 7 'feature_defines': [
8 'ENABLE_CHANNEL_MESSAGING=1', 8 'ENABLE_CHANNEL_MESSAGING=1',
9 'ENABLE_DATABASE=1', 9 'ENABLE_DATABASE=1',
10 'ENABLE_DATAGRID=0', 10 'ENABLE_DATAGRID=0',
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 'webcore_include_dirs': [ 157 'webcore_include_dirs': [
158 '../third_party/WebKit/WebCore/page/win', 158 '../third_party/WebKit/WebCore/page/win',
159 '../third_party/WebKit/WebCore/platform/graphics/win', 159 '../third_party/WebKit/WebCore/platform/graphics/win',
160 '../third_party/WebKit/WebCore/platform/text/win', 160 '../third_party/WebKit/WebCore/platform/text/win',
161 '../third_party/WebKit/WebCore/platform/win', 161 '../third_party/WebKit/WebCore/platform/win',
162 ], 162 ],
163 }], 163 }],
164 ], 164 ],
165 }, 165 },
166 'includes': [ 166 'includes': [
167 '../build/common.gypi',
168 '../third_party/WebKit/JavaScriptCore/JavaScriptCore.gypi', 167 '../third_party/WebKit/JavaScriptCore/JavaScriptCore.gypi',
169 '../third_party/WebKit/WebCore/WebCore.gypi', 168 '../third_party/WebKit/WebCore/WebCore.gypi',
170 ], 169 ],
171 'targets': [ 170 'targets': [
172 { 171 {
173 # Currently, builders assume webkit.sln builds test_shell on windows. 172 # Currently, builders assume webkit.sln builds test_shell on windows.
174 # We should change this, but for now allows trybot runs. 173 # We should change this, but for now allows trybot runs.
175 # for now. 174 # for now.
176 'target_name': 'pull_in_test_shell', 175 'target_name': 'pull_in_test_shell',
177 'type': 'none', 176 'type': 'none',
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 'files': [ 1557 'files': [
1559 1558
1560 '<@(webinspector_image_files)', 1559 '<@(webinspector_image_files)',
1561 1560
1562 ], 1561 ],
1563 }, 1562 },
1564 ], 1563 ],
1565 }, 1564 },
1566 ], # targets 1565 ], # targets
1567 } 1566 }
OLDNEW
« o3d/DEPS_gyp ('K') | « webkit/tools/test_shell/test_shell.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698