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

Side by Side Diff: trunk/src/base/base.gyp

Issue 24365012: Revert 225054 "linux_aura: Implement most of DesktopScreenX11." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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 | trunk/src/base/base.gypi » ('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 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 ], 70 ],
71 }], 71 }],
72 ['use_x11==1', { 72 ['use_x11==1', {
73 'dependencies': [ 73 'dependencies': [
74 '../build/linux/system.gyp:x11', 74 '../build/linux/system.gyp:x11',
75 ], 75 ],
76 'export_dependent_settings': [ 76 'export_dependent_settings': [
77 '../build/linux/system.gyp:x11', 77 '../build/linux/system.gyp:x11',
78 ], 78 ],
79 }], 79 }],
80 ['use_aura==1 and use_x11==1', {
81 'dependencies': [
82 '../build/linux/system.gyp:xrandr',
83 ],
84 'export_dependent_settings': [
85 '../build/linux/system.gyp:xrandr',
86 ],
87 }],
88 ['OS == "android" and _toolset == "host"', { 80 ['OS == "android" and _toolset == "host"', {
89 # Always build base as a static_library for host toolset, even if 81 # Always build base as a static_library for host toolset, even if
90 # we're doing a component build. Specifically, we only care about the 82 # we're doing a component build. Specifically, we only care about the
91 # target toolset using components since that's what developers are 83 # target toolset using components since that's what developers are
92 # focusing on. In theory we should do this more generally for all 84 # focusing on. In theory we should do this more generally for all
93 # targets when building for host, but getting the gyp magic 85 # targets when building for host, but getting the gyp magic
94 # per-toolset for the "component" variable is hard, and we really only 86 # per-toolset for the "component" variable is hard, and we really only
95 # need base on host. 87 # need base on host.
96 'type': 'static_library', 88 'type': 'static_library',
97 # Base for host support is the minimum required to run the 89 # Base for host support is the minimum required to run the
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
810 ], 802 ],
811 'sources/': [ 803 'sources/': [
812 ['exclude', '^win/'], 804 ['exclude', '^win/'],
813 ], 805 ],
814 'sources!': [ 806 'sources!': [
815 'debug/trace_event_win_unittest.cc', 807 'debug/trace_event_win_unittest.cc',
816 'time/time_win_unittest.cc', 808 'time/time_win_unittest.cc',
817 'win/win_util_unittest.cc', 809 'win/win_util_unittest.cc',
818 ], 810 ],
819 }], 811 }],
820 ['use_aura==1 and use_x11==1', {
821 'sources': [
822 'x11/edid_parser_x11_unittest.cc',
823 ],
824 }],
825 ['use_system_nspr==1', { 812 ['use_system_nspr==1', {
826 'dependencies': [ 813 'dependencies': [
827 'third_party/nspr/nspr.gyp:nspr', 814 'third_party/nspr/nspr.gyp:nspr',
828 ], 815 ],
829 }], 816 }],
830 ], # conditions 817 ], # conditions
831 'target_conditions': [ 818 'target_conditions': [
832 ['OS == "ios" and _toolset != "host"', { 819 ['OS == "ios" and _toolset != "host"', {
833 'sources/': [ 820 'sources/': [
834 # Pull in specific Mac files for iOS (which have been filtered out 821 # Pull in specific Mac files for iOS (which have been filtered out
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after
1344 'base_unittests.isolate', 1331 'base_unittests.isolate',
1345 ], 1332 ],
1346 'sources': [ 1333 'sources': [
1347 'base_unittests.isolate', 1334 'base_unittests.isolate',
1348 ], 1335 ],
1349 }, 1336 },
1350 ], 1337 ],
1351 }], 1338 }],
1352 ], 1339 ],
1353 } 1340 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/base/base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698