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

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

Issue 252963004: MacViews: Fix builds when use_aura XOR toolkit_views is TRUE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 'dependencies': [ 341 'dependencies': [
342 'gfx_jni_headers', 342 'gfx_jni_headers',
343 ], 343 ],
344 'link_settings': { 344 'link_settings': {
345 'libraries': [ 345 'libraries': [
346 '-landroid', 346 '-landroid',
347 '-ljnigraphics', 347 '-ljnigraphics',
348 ], 348 ],
349 }, 349 },
350 }], 350 }],
351 ['use_aura==0', { 351 ['use_aura==0 and toolkit_views==0', {
352 'sources!': [ 352 'sources!': [
353 'nine_image_painter.cc', 353 'nine_image_painter.cc',
354 'nine_image_painter.h', 354 'nine_image_painter.h',
355 ], 355 ],
356 }], 356 }],
357 ['OS=="android" and use_aura==0', { 357 ['OS=="android" and use_aura==0', {
358 'sources!': [ 358 'sources!': [
359 'path.cc', 359 'path.cc',
360 ], 360 ],
361 }], 361 }],
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 'x/x11_error_tracker.cc', 556 'x/x11_error_tracker.cc',
557 'x/x11_error_tracker.h', 557 'x/x11_error_tracker.h',
558 'x/x11_types.cc', 558 'x/x11_types.cc',
559 'x/x11_types.h', 559 'x/x11_types.h',
560 ], 560 ],
561 }, 561 },
562 ] 562 ]
563 }], 563 }],
564 ], 564 ],
565 } 565 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698