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

Side by Side Diff: base/base.gyp

Issue 238633004: Remove all uses of toolkit_use_gtk in the gyp files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 years, 8 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 | build/all.gyp » ('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 22 matching lines...) Expand all
33 'include_dirs': [ 33 'include_dirs': [
34 '..', 34 '..',
35 ], 35 ],
36 }, 36 },
37 'conditions': [ 37 'conditions': [
38 ['desktop_linux == 1 or chromeos == 1', { 38 ['desktop_linux == 1 or chromeos == 1', {
39 'conditions': [ 39 'conditions': [
40 ['chromeos==1', { 40 ['chromeos==1', {
41 'sources/': [ ['include', '_chromeos\\.cc$'] ] 41 'sources/': [ ['include', '_chromeos\\.cc$'] ]
42 }], 42 }],
43 ['toolkit_uses_gtk==1', {
44 'dependencies': [
45 '../build/linux/system.gyp:gtk',
46 ],
47 'export_dependent_settings': [
48 '../build/linux/system.gyp:gtk',
49 ],
50 }],
51 ], 43 ],
52 'dependencies': [ 44 'dependencies': [
53 'symbolize', 45 'symbolize',
54 'xdg_mime', 46 'xdg_mime',
55 ], 47 ],
56 'defines': [ 48 'defines': [
57 'USE_SYMBOLIZE', 49 'USE_SYMBOLIZE',
58 ], 50 ],
59 }, { # desktop_linux == 0 and chromeos == 0 51 }, { # desktop_linux == 0 and chromeos == 0
60 'sources/': [ 52 'sources/': [
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 'optimize': 'max', 236 'optimize': 'max',
245 'base_i18n_target': 1, 237 'base_i18n_target': 1,
246 }, 238 },
247 'dependencies': [ 239 'dependencies': [
248 'base', 240 'base',
249 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 241 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
250 '../third_party/icu/icu.gyp:icui18n', 242 '../third_party/icu/icu.gyp:icui18n',
251 '../third_party/icu/icu.gyp:icuuc', 243 '../third_party/icu/icu.gyp:icuuc',
252 ], 244 ],
253 'conditions': [ 245 'conditions': [
254 ['toolkit_uses_gtk==1', {
255 'dependencies': [
256 # i18n/rtl.cc uses gtk
257 '../build/linux/system.gyp:gtk',
258 ],
259 }],
260 ['OS == "win"', { 246 ['OS == "win"', {
261 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 247 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
262 'msvs_disabled_warnings': [ 248 'msvs_disabled_warnings': [
263 4267, 249 4267,
264 ], 250 ],
265 }], 251 }],
266 ['icu_use_data_file_flag==1', { 252 ['icu_use_data_file_flag==1', {
267 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], 253 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'],
268 }, { # else icu_use_data_file_flag !=1 254 }, { # else icu_use_data_file_flag !=1
269 'conditions': [ 255 'conditions': [
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
687 ], 673 ],
688 }], 674 }],
689 ['desktop_linux == 1 or chromeos == 1', { 675 ['desktop_linux == 1 or chromeos == 1', {
690 'defines': [ 676 'defines': [
691 'USE_SYMBOLIZE', 677 'USE_SYMBOLIZE',
692 ], 678 ],
693 'sources!': [ 679 'sources!': [
694 'file_version_info_unittest.cc', 680 'file_version_info_unittest.cc',
695 ], 681 ],
696 'conditions': [ 682 'conditions': [
697 [ 'toolkit_uses_gtk==1', { 683 [ 'desktop_linux==1', {
698 'sources': [ 684 'sources': [
699 'nix/xdg_util_unittest.cc', 685 'nix/xdg_util_unittest.cc',
700 ], 686 ],
701 'dependencies': [
702 '../build/linux/system.gyp:gtk',
703 ]
704 }], 687 }],
705 ], 688 ],
706 }], 689 }],
707 ['use_glib == 1', { 690 ['use_glib == 1', {
708 'dependencies': [ 691 'dependencies': [
709 '../build/linux/system.gyp:glib', 692 '../build/linux/system.gyp:glib',
710 ], 693 ],
711 }, { # use_glib == 0 694 }, { # use_glib == 0
712 'sources!': [ 695 'sources!': [
713 'message_loop/message_pump_glib_unittest.cc', 696 'message_loop/message_pump_glib_unittest.cc',
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
824 'base_i18n', 807 'base_i18n',
825 '../testing/gmock.gyp:gmock', 808 '../testing/gmock.gyp:gmock',
826 '../testing/gtest.gyp:gtest', 809 '../testing/gtest.gyp:gtest',
827 '../third_party/libxml/libxml.gyp:libxml', 810 '../third_party/libxml/libxml.gyp:libxml',
828 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 811 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
829 ], 812 ],
830 'export_dependent_settings': [ 813 'export_dependent_settings': [
831 'base', 814 'base',
832 ], 815 ],
833 'conditions': [ 816 'conditions': [
834 ['toolkit_uses_gtk==1', {
835 'dependencies': [
836 # test_suite initializes GTK.
837 '../build/linux/system.gyp:gtk',
838 ],
839 }],
840 ['os_posix==0', { 817 ['os_posix==0', {
841 'sources!': [ 818 'sources!': [
842 'test/scoped_locale.cc', 819 'test/scoped_locale.cc',
843 'test/scoped_locale.h', 820 'test/scoped_locale.h',
844 ], 821 ],
845 }], 822 }],
846 ['os_bsd==1', { 823 ['os_bsd==1', {
847 'sources!': [ 824 'sources!': [
848 'test/test_file_util_linux.cc', 825 'test/test_file_util_linux.cc',
849 ], 826 ],
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 '../testing/gtest.gyp:gtest', 942 '../testing/gtest.gyp:gtest',
966 ], 943 ],
967 'sources': [ 944 'sources': [
968 'test/run_all_perftests.cc', 945 'test/run_all_perftests.cc',
969 ], 946 ],
970 'direct_dependent_settings': { 947 'direct_dependent_settings': {
971 'defines': [ 948 'defines': [
972 'PERF_TEST', 949 'PERF_TEST',
973 ], 950 ],
974 }, 951 },
975 'conditions': [
976 ['toolkit_uses_gtk==1', {
977 'dependencies': [
978 # Needed to handle the #include chain:
979 # base/test/perf_test_suite.h
980 # base/test/test_suite.h
981 # gtk/gtk.h
982 '../build/linux/system.gyp:gtk',
983 ],
984 }],
985 ],
986 }, 952 },
987 { 953 {
988 'target_name': 'sanitizer_options', 954 'target_name': 'sanitizer_options',
989 'type': 'static_library', 955 'type': 'static_library',
990 'toolsets': ['host', 'target'], 956 'toolsets': ['host', 'target'],
991 'variables': { 957 'variables': {
992 # Every target is going to depend on sanitizer_options, so allow 958 # Every target is going to depend on sanitizer_options, so allow
993 # this one to depend on itself. 959 # this one to depend on itself.
994 'prune_self_dependency': 1, 960 'prune_self_dependency': 1,
995 # Do not let 'none' targets depend on this one, they don't need to. 961 # Do not let 'none' targets depend on this one, they don't need to.
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1466 'base_unittests.isolate', 1432 'base_unittests.isolate',
1467 ], 1433 ],
1468 'sources': [ 1434 'sources': [
1469 'base_unittests.isolate', 1435 'base_unittests.isolate',
1470 ], 1436 ],
1471 }, 1437 },
1472 ], 1438 ],
1473 }], 1439 }],
1474 ], 1440 ],
1475 } 1441 }
OLDNEW
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698