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

Side by Side Diff: views/views.gyp

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed some chrome changes Created 9 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 9
10 'target_defaults': { 10 'target_defaults': {
11 'conditions': [ 11 'conditions': [
12 ['OS=="win"', {'sources/': [ 12 ['OS=="win"', {'sources/': [
13 ['include', '_(win)\\.cc$'], 13 ['include', '_(win)\\.cc$'],
14 ['include', '/win/'], 14 ['include', '/win/'],
15 ['include', '/win_[^/]*\\.cc$'], 15 ['include', '/win_[^/]*\\.cc$'],
16 ['exclude', 'touchui/touch_factory.cc'],
17 ]}], 16 ]}],
18 ['touchui==0', { 17 ['touchui==0', {
19 'sources/': [ 18 'sources/': [
20 ['exclude', '_(touch)\\.cc$'], 19 ['exclude', '_(touch)\\.cc$'],
20 ['exclude', 'touchui/touch_factory.cc'],
sadrul 2011/09/22 17:44:31 This should not be the case: the touch_factory sho
DaveMoore 2011/09/22 18:03:07 Done.
21 ], 21 ],
22 }], 22 }],
23 ['use_aura==1', { 23 ['use_aura==1', {
24 'sources/': [ ['exclude', '_win\\.(h|cc)$'], 24 'sources/': [ ['exclude', '_win\\.(h|cc)$'],
25 ['exclude', '_gtk\\.(h|cc)$'], 25 ['exclude', '_gtk\\.(h|cc)$'],
26 ['exclude', '_x\\.(h|cc)$'] ], 26 ['exclude', '_x\\.(h|cc)$'] ],
27 }], 27 }],
28 ], 28 ],
29 }, 29 },
30 'targets': [ 30 'targets': [
(...skipping 512 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 }], 543 }],
544 ], 544 ],
545 }, 545 },
546 { 546 {
547 'target_name': 'views_unittests', 547 'target_name': 'views_unittests',
548 'type': 'executable', 548 'type': 'executable',
549 'dependencies': [ 549 'dependencies': [
550 '../base/base.gyp:base', 550 '../base/base.gyp:base',
551 '../base/base.gyp:test_support_base', 551 '../base/base.gyp:test_support_base',
552 '../build/temp_gyp/googleurl.gyp:googleurl', 552 '../build/temp_gyp/googleurl.gyp:googleurl',
553 '../chrome/chrome.gyp:packed_resources',
sadrul 2011/09/22 17:44:31 Having to do this is unfortunate. It'd be wonderfu
553 '../skia/skia.gyp:skia', 554 '../skia/skia.gyp:skia',
554 '../testing/gmock.gyp:gmock', 555 '../testing/gmock.gyp:gmock',
555 '../testing/gtest.gyp:gtest', 556 '../testing/gtest.gyp:gtest',
556 '../third_party/icu/icu.gyp:icui18n', 557 '../third_party/icu/icu.gyp:icui18n',
557 '../third_party/icu/icu.gyp:icuuc', 558 '../third_party/icu/icu.gyp:icuuc',
558 '../ui/base/strings/ui_strings.gyp:ui_strings', 559 '../ui/base/strings/ui_strings.gyp:ui_strings',
560 '../ui/gfx/compositor/compositor.gyp:compositor',
559 '../ui/ui.gyp:gfx_resources', 561 '../ui/ui.gyp:gfx_resources',
560 '../ui/ui.gyp:ui', 562 '../ui/ui.gyp:ui',
561 '../ui/ui.gyp:ui_resources', 563 '../ui/ui.gyp:ui_resources',
562 '../ui/ui.gyp:ui_resources_standard', 564 '../ui/ui.gyp:ui_resources_standard',
563 'views', 565 'views',
564 ], 566 ],
565 'include_dirs': [ 567 'include_dirs': [
566 '..', 568 '..',
567 ], 569 ],
568 'sources': [ 570 'sources': [
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 'include_dirs': [ 912 'include_dirs': [
911 '<(DEPTH)/third_party/wtl/include', 913 '<(DEPTH)/third_party/wtl/include',
912 ], 914 ],
913 }], 915 }],
914 ], 916 ],
915 }, 917 },
916 ], 918 ],
917 }], 919 }],
918 ], 920 ],
919 } 921 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698