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

Side by Side Diff: build/common.gypi

Issue 9264025: aura: Replace UI-feature GYP flags with switches. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 8 years, 11 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 | « ash/wm/power_button_controller_unittest.cc ('k') | chrome/browser/about_flags.cc » ('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 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 # Variables expected to be overriden on the GYP command line (-D) or by 9 # Variables expected to be overriden on the GYP command line (-D) or by
10 # ~/.gyp/include.gypi. 10 # ~/.gyp/include.gypi.
(...skipping 27 matching lines...) Expand all
38 38
39 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803 39 # Use OpenSSL instead of NSS. Under development: see http://crbug.com/ 62803
40 'use_openssl%': 0, 40 'use_openssl%': 0,
41 41
42 # Disable Virtual keyboard support by default. 42 # Disable Virtual keyboard support by default.
43 'use_virtual_keyboard%': 0, 43 'use_virtual_keyboard%': 0,
44 44
45 # Default setting for use_skia on mac platform. 45 # Default setting for use_skia on mac platform.
46 # This is typically overridden in use_skia_on_mac.gypi. 46 # This is typically overridden in use_skia_on_mac.gypi.
47 'use_skia_on_mac%': 0, 47 'use_skia_on_mac%': 0,
48
49 # Whether or not to show the aura-window-mode flag in about://flags.
50 # TODO(alicet): Remove this when we can expose the flag to
51 # all chromeos platforms.
52 'aura_show_about_flag_window_mode': 0,
53 }, 48 },
54 # Copy conditionally-set variables out one scope. 49 # Copy conditionally-set variables out one scope.
55 'chromeos%': '<(chromeos)', 50 'chromeos%': '<(chromeos)',
56 'aura_show_about_flag_window_mode%': '<(aura_show_about_flag_window_mode )',
57 'views_compositor%': '<(views_compositor)', 51 'views_compositor%': '<(views_compositor)',
58 'use_aura%': '<(use_aura)', 52 'use_aura%': '<(use_aura)',
59 'use_ash%': '<(use_ash)', 53 'use_ash%': '<(use_ash)',
60 'use_openssl%': '<(use_openssl)', 54 'use_openssl%': '<(use_openssl)',
61 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 55 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
62 'use_skia_on_mac%': '<(use_skia_on_mac)', 56 'use_skia_on_mac%': '<(use_skia_on_mac)',
63 57
64 # Compute the architecture that we're building on. 58 # Compute the architecture that we're building on.
65 'conditions': [ 59 'conditions': [
66 [ 'OS=="win" or OS=="mac"', { 60 [ 'OS=="win" or OS=="mac"', {
67 'host_arch%': 'ia32', 61 'host_arch%': 'ia32',
68 }, { 62 }, {
69 # This handles the Unix platforms for which there is some support. 63 # This handles the Unix platforms for which there is some support.
70 # Anything else gets passed through, which probably won't work very 64 # Anything else gets passed through, which probably won't work very
71 # well; such hosts should pass an explicit target_arch to gyp. 65 # well; such hosts should pass an explicit target_arch to gyp.
72 'host_arch%': 66 'host_arch%':
73 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")', 67 '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/a rm.*/arm/;s/i86pc/ia32/")',
74 }], 68 }],
75 69
76 # Ash requires Aura. 70 # Ash requires Aura.
77 ['use_ash==1', { 71 ['use_ash==1', {
78 'use_aura%': 1, 72 'use_aura%': 1,
79 }], 73 }],
80 74
81 # show aura-window-mode about flag by default.
82 ['use_aura==1', {
83 'aura_show_about_flag_window_mode': 1,
84 }],
85
86 # Set default value of toolkit_views based on OS. 75 # Set default value of toolkit_views based on OS.
87 ['OS=="win" or chromeos==1 or use_aura==1', { 76 ['OS=="win" or chromeos==1 or use_aura==1', {
88 'toolkit_views%': 1, 77 'toolkit_views%': 1,
89 }, { 78 }, {
90 'toolkit_views%': 0, 79 'toolkit_views%': 0,
91 }], 80 }],
92 81
93 # Use the views compositor when using the Aura window manager. 82 # Use the views compositor when using the Aura window manager.
94 ['use_aura==1', { 83 ['use_aura==1', {
95 'views_compositor%': 1, 84 'views_compositor%': 1,
96 }], 85 }],
97 86
98 # Use the WebKit compositor for ui, when Aura is on. 87 # Use the WebKit compositor for ui, when Aura is on.
99 ['use_aura==1', { 88 ['use_aura==1', {
100 'use_webkit_compositor%': 1, 89 'use_webkit_compositor%': 1,
101 }, { 90 }, {
102 'use_webkit_compositor%': 0, 91 'use_webkit_compositor%': 0,
103 }], 92 }],
104 ], 93 ],
105 }, 94 },
106 95
107 # Copy conditionally-set variables out one scope. 96 # Copy conditionally-set variables out one scope.
108 'chromeos%': '<(chromeos)', 97 'chromeos%': '<(chromeos)',
109 'host_arch%': '<(host_arch)', 98 'host_arch%': '<(host_arch)',
110 'aura_show_about_flag_window_mode%': '<(aura_show_about_flag_window_mode)' ,
111 'toolkit_views%': '<(toolkit_views)', 99 'toolkit_views%': '<(toolkit_views)',
112 'views_compositor%': '<(views_compositor)', 100 'views_compositor%': '<(views_compositor)',
113 'use_webkit_compositor%': '<(use_webkit_compositor)', 101 'use_webkit_compositor%': '<(use_webkit_compositor)',
114 'use_aura%': '<(use_aura)', 102 'use_aura%': '<(use_aura)',
115 'use_ash%': '<(use_ash)', 103 'use_ash%': '<(use_ash)',
116 'use_openssl%': '<(use_openssl)', 104 'use_openssl%': '<(use_openssl)',
117 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 105 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
118 'use_skia_on_mac%': '<(use_skia_on_mac)', 106 'use_skia_on_mac%': '<(use_skia_on_mac)',
119 107
120 # We used to provide a variable for changing how libraries were built. 108 # We used to provide a variable for changing how libraries were built.
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 }], 381 }],
394 ], 382 ],
395 }, 383 },
396 384
397 # Copy conditionally-set variables out one scope. 385 # Copy conditionally-set variables out one scope.
398 'branding%': '<(branding)', 386 'branding%': '<(branding)',
399 'buildtype%': '<(buildtype)', 387 'buildtype%': '<(buildtype)',
400 'target_arch%': '<(target_arch)', 388 'target_arch%': '<(target_arch)',
401 'host_arch%': '<(host_arch)', 389 'host_arch%': '<(host_arch)',
402 'library%': 'static_library', 390 'library%': 'static_library',
403 'aura_show_about_flag_window_mode%': '<(aura_show_about_flag_window_mode)',
404 'toolkit_views%': '<(toolkit_views)', 391 'toolkit_views%': '<(toolkit_views)',
405 'views_compositor%': '<(views_compositor)', 392 'views_compositor%': '<(views_compositor)',
406 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 393 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
407 'use_webkit_compositor%': '<(use_webkit_compositor)', 394 'use_webkit_compositor%': '<(use_webkit_compositor)',
408 'use_aura%': '<(use_aura)', 395 'use_aura%': '<(use_aura)',
409 'use_ash%': '<(use_ash)', 396 'use_ash%': '<(use_ash)',
410 'use_openssl%': '<(use_openssl)', 397 'use_openssl%': '<(use_openssl)',
411 'use_nss%': '<(use_nss)', 398 'use_nss%': '<(use_nss)',
412 'os_bsd%': '<(os_bsd)', 399 'os_bsd%': '<(os_bsd)',
413 'os_posix%': '<(os_posix)', 400 'os_posix%': '<(os_posix)',
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
675 'build_webkit_exes_from_webkit_gyp%': 0, 662 'build_webkit_exes_from_webkit_gyp%': 0,
676 663
677 # This flag is only used when disable_nacl==0 and disables all those 664 # This flag is only used when disable_nacl==0 and disables all those
678 # subcomponents which would require the installation of a native_client 665 # subcomponents which would require the installation of a native_client
679 # untrusted toolchain. 666 # untrusted toolchain.
680 'disable_nacl_untrusted%': 0, 667 'disable_nacl_untrusted%': 0,
681 668
682 # Disable Dart by default. 669 # Disable Dart by default.
683 'enable_dart%': 0, 670 'enable_dart%': 0,
684 671
685 # (Most) Chrome OS hardware reports ACPI power button releases correctly.
686 # Standard hardware reports releases immediately after presses.
687 'chromeos_legacy_power_button%': 0,
688
689 'conditions': [ 672 'conditions': [
690 # Used to disable Native Client at compile time, for platforms where it 673 # Used to disable Native Client at compile time, for platforms where it
691 # isn't supported (ARM) 674 # isn't supported (ARM)
692 ['target_arch=="arm" and chromeos == 1', { 675 ['target_arch=="arm" and chromeos == 1', {
693 'disable_nacl%': 1, 676 'disable_nacl%': 1,
694 }, { 677 }, {
695 'disable_nacl%': 0, 678 'disable_nacl%': 0,
696 }], 679 }],
697 ['os_posix==1 and OS!="mac" and OS!="android"', { 680 ['os_posix==1 and OS!="mac" and OS!="android"', {
698 # This will set gcc_version to XY if you are running gcc X.Y.*. 681 # This will set gcc_version to XY if you are running gcc X.Y.*.
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 # consistency they should look for google_chrome_build like C++. 860 # consistency they should look for google_chrome_build like C++.
878 'grit_defines': ['-D', '_google_chrome', 861 'grit_defines': ['-D', '_google_chrome',
879 '-E', 'CHROMIUM_BUILD=google_chrome'], 862 '-E', 'CHROMIUM_BUILD=google_chrome'],
880 }, { 863 }, {
881 'grit_defines': ['-D', '_chromium', 864 'grit_defines': ['-D', '_chromium',
882 '-E', 'CHROMIUM_BUILD=chromium'], 865 '-E', 'CHROMIUM_BUILD=chromium'],
883 }], 866 }],
884 ['chromeos==1', { 867 ['chromeos==1', {
885 'grit_defines': ['-D', 'chromeos'], 868 'grit_defines': ['-D', 'chromeos'],
886 }], 869 }],
887 ['aura_show_about_flag_window_mode==1', {
888 'grit_defines': ['-D', 'aura_show_about_flag_window_mode'],
889 }],
890 ['toolkit_views==1', { 870 ['toolkit_views==1', {
891 'grit_defines': ['-D', 'toolkit_views'], 871 'grit_defines': ['-D', 'toolkit_views'],
892 }], 872 }],
893 ['use_aura==1', { 873 ['use_aura==1', {
894 'grit_defines': ['-D', 'use_aura'], 874 'grit_defines': ['-D', 'use_aura'],
895 }], 875 }],
896 ['use_ash==1', { 876 ['use_ash==1', {
897 'grit_defines': ['-D', 'use_ash'], 877 'grit_defines': ['-D', 'use_ash'],
898 }], 878 }],
899 ['use_nss==1', { 879 ['use_nss==1', {
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 'defines': ['COMPONENT_BUILD'], 1028 'defines': ['COMPONENT_BUILD'],
1049 }], 1029 }],
1050 ['component=="shared_library" and incremental_chrome_dll==1', { 1030 ['component=="shared_library" and incremental_chrome_dll==1', {
1051 # TODO(dpranke): We can't incrementally link chrome when 1031 # TODO(dpranke): We can't incrementally link chrome when
1052 # content is being built as a DLL because chrome links in 1032 # content is being built as a DLL because chrome links in
1053 # webkit_glue and webkit_glue depends on symbols defined in 1033 # webkit_glue and webkit_glue depends on symbols defined in
1054 # content. We can remove this when we fix glue. 1034 # content. We can remove this when we fix glue.
1055 # See http://code.google.com/p/chromium/issues/detail?id=98755 . 1035 # See http://code.google.com/p/chromium/issues/detail?id=98755 .
1056 'defines': ['COMPILE_CONTENT_STATICALLY'], 1036 'defines': ['COMPILE_CONTENT_STATICALLY'],
1057 }], 1037 }],
1058 ['aura_show_about_flag_window_mode==1', {
1059 'defines': ['AURA_SHOW_ABOUT_FLAG_WINDOW_MODE=1'],
1060 }],
1061 ['toolkit_views==1', { 1038 ['toolkit_views==1', {
1062 'defines': ['TOOLKIT_VIEWS=1'], 1039 'defines': ['TOOLKIT_VIEWS=1'],
1063 }], 1040 }],
1064 ['views_compositor==1', { 1041 ['views_compositor==1', {
1065 'defines': ['VIEWS_COMPOSITOR=1'], 1042 'defines': ['VIEWS_COMPOSITOR=1'],
1066 }], 1043 }],
1067 ['ui_compositor_image_transport==1', { 1044 ['ui_compositor_image_transport==1', {
1068 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 1045 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
1069 }], 1046 }],
1070 ['use_webkit_compositor==1', { 1047 ['use_webkit_compositor==1', {
(...skipping 12 matching lines...) Expand all
1083 'defines': ['TOOLKIT_USES_GTK=1'], 1060 'defines': ['TOOLKIT_USES_GTK=1'],
1084 }], 1061 }],
1085 ['toolkit_uses_gtk==1 and toolkit_views==0', { 1062 ['toolkit_uses_gtk==1 and toolkit_views==0', {
1086 # TODO(erg): We are progressively sealing up use of deprecated features 1063 # TODO(erg): We are progressively sealing up use of deprecated features
1087 # in gtk in preparation for an eventual porting to gtk3. 1064 # in gtk in preparation for an eventual porting to gtk3.
1088 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'], 1065 'defines': ['GTK_DISABLE_SINGLE_INCLUDES=1'],
1089 }], 1066 }],
1090 ['chromeos==1', { 1067 ['chromeos==1', {
1091 'defines': ['OS_CHROMEOS=1'], 1068 'defines': ['OS_CHROMEOS=1'],
1092 }], 1069 }],
1093 ['chromeos_legacy_power_button==1', {
1094 'defines': ['CHROMEOS_LEGACY_POWER_BUTTON=1'],
1095 }],
1096 ['use_virtual_keyboard==1', { 1070 ['use_virtual_keyboard==1', {
1097 'defines': ['USE_VIRTUAL_KEYBOARD=1'], 1071 'defines': ['USE_VIRTUAL_KEYBOARD=1'],
1098 }], 1072 }],
1099 ['use_xi2_mt!=0', { 1073 ['use_xi2_mt!=0', {
1100 'defines': ['USE_XI2_MT=<(use_xi2_mt)'], 1074 'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
1101 }], 1075 }],
1102 ['use_wayland==1', { 1076 ['use_wayland==1', {
1103 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'], 1077 'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
1104 }], 1078 }],
1105 ['file_manager_extension==1', { 1079 ['file_manager_extension==1', {
(...skipping 1737 matching lines...) Expand 10 before | Expand all | Expand 10 after
2843 # settings in target dicts. SYMROOT is a special case, because many other 2817 # settings in target dicts. SYMROOT is a special case, because many other
2844 # Xcode variables depend on it, including variables such as 2818 # Xcode variables depend on it, including variables such as
2845 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2819 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2846 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2820 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2847 # files to appear (when present) in the UI as actual files and not red 2821 # files to appear (when present) in the UI as actual files and not red
2848 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2822 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2849 # and therefore SYMROOT, needs to be set at the project level. 2823 # and therefore SYMROOT, needs to be set at the project level.
2850 'SYMROOT': '<(DEPTH)/xcodebuild', 2824 'SYMROOT': '<(DEPTH)/xcodebuild',
2851 }, 2825 },
2852 } 2826 }
OLDNEW
« no previous file with comments | « ash/wm/power_button_controller_unittest.cc ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698