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

Side by Side Diff: ui/aura/aura.gyp

Issue 2111373002: Reland of Link to DirectWrite directly, instead of calling LoadLibrary (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 5 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
« no previous file with comments | « content/test/BUILD.gn ('k') | ui/gfx/BUILD.gn » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 ], 236 ],
237 'sources': [ 237 'sources': [
238 'demo/demo_main.cc', 238 'demo/demo_main.cc',
239 ], 239 ],
240 'conditions': [ 240 'conditions': [
241 ['use_x11==1', { 241 ['use_x11==1', {
242 'dependencies': [ 242 'dependencies': [
243 '../gfx/x/gfx_x11.gyp:gfx_x11', 243 '../gfx/x/gfx_x11.gyp:gfx_x11',
244 ], 244 ],
245 }], 245 }],
246 ['OS=="win"', {
247 'msvs_settings': {
248 'VCLinkerTool': {
249 'AdditionalDependencies': [
250 'dwrite.lib',
251 ]
252 }
253 }
254 }],
246 ] 255 ]
247 }, 256 },
248 { 257 {
249 'target_name': 'aura_unittests', 258 'target_name': 'aura_unittests',
250 'type': 'executable', 259 'type': 'executable',
251 'dependencies': [ 260 'dependencies': [
252 '../../base/base.gyp:test_support_base', 261 '../../base/base.gyp:test_support_base',
253 '../../skia/skia.gyp:skia', 262 '../../skia/skia.gyp:skia',
254 '../../testing/gtest.gyp:gtest', 263 '../../testing/gtest.gyp:gtest',
255 '../base/ime/ui_base_ime.gyp:ui_base_ime', 264 '../base/ime/ui_base_ime.gyp:ui_base_ime',
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 'dependencies': [ 316 'dependencies': [
308 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 317 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
309 ], 318 ],
310 }], 319 }],
311 ], 320 ],
312 }, 321 },
313 ], 322 ],
314 }], 323 }],
315 ], 324 ],
316 } 325 }
OLDNEW
« no previous file with comments | « content/test/BUILD.gn ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698