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

Side by Side Diff: build/common.gypi

Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: unifdef controller from startup, lets us do nicer excludes Created 8 years, 1 month 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
« no previous file with comments | « no previous file | chrome/app/theme/theme_resources.grd » ('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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 127
128 # Enable HiDPI on Mac OS and Chrome OS. 128 # Enable HiDPI on Mac OS and Chrome OS.
129 ['OS=="mac" or chromeos==1', { 129 ['OS=="mac" or chromeos==1', {
130 'enable_hidpi%': 1, 130 'enable_hidpi%': 1,
131 }], 131 }],
132 132
133 # Enable touch UI on Metro. 133 # Enable touch UI on Metro.
134 ['OS=="win"', { 134 ['OS=="win"', {
135 'enable_touch_ui%': 1, 135 'enable_touch_ui%': 1,
136 }], 136 }],
137
138 # Enable App Launcher only on ChromeOS and Windows for now.
139 ['use_ash==1 or OS=="win"', {
140 'enable_app_list%': 1,
141 }, {
142 'enable_app_list%': 0,
143 }],
137 ], 144 ],
138 }, 145 },
139 146
140 # Copy conditionally-set variables out one scope. 147 # Copy conditionally-set variables out one scope.
141 'chromeos%': '<(chromeos)', 148 'chromeos%': '<(chromeos)',
142 'host_arch%': '<(host_arch)', 149 'host_arch%': '<(host_arch)',
143 'toolkit_views%': '<(toolkit_views)', 150 'toolkit_views%': '<(toolkit_views)',
144 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 151 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
145 'use_aura%': '<(use_aura)', 152 'use_aura%': '<(use_aura)',
146 'use_ash%': '<(use_ash)', 153 'use_ash%': '<(use_ash)',
147 'use_openssl%': '<(use_openssl)', 154 'use_openssl%': '<(use_openssl)',
148 'use_ibus%': '<(use_ibus)', 155 'use_ibus%': '<(use_ibus)',
149 'enable_viewport%': '<(enable_viewport)', 156 'enable_viewport%': '<(enable_viewport)',
150 'enable_hidpi%': '<(enable_hidpi)', 157 'enable_hidpi%': '<(enable_hidpi)',
151 'enable_touch_ui%': '<(enable_touch_ui)', 158 'enable_touch_ui%': '<(enable_touch_ui)',
152 'android_upstream_bringup%': '<(android_upstream_bringup)', 159 'android_upstream_bringup%': '<(android_upstream_bringup)',
153 'android_build_type%': '<(android_build_type)', 160 'android_build_type%': '<(android_build_type)',
161 'enable_app_list%': '<(enable_app_list)',
154 162
155 # We used to provide a variable for changing how libraries were built. 163 # We used to provide a variable for changing how libraries were built.
156 # This variable remains until we can clean up all the users. 164 # This variable remains until we can clean up all the users.
157 # This needs to be one nested variables dict in so that dependent 165 # This needs to be one nested variables dict in so that dependent
158 # gyp files can make use of it in their outer variables. (Yikes!) 166 # gyp files can make use of it in their outer variables. (Yikes!)
159 # http://code.google.com/p/chromium/issues/detail?id=83308 167 # http://code.google.com/p/chromium/issues/detail?id=83308
160 'library%': 'static_library', 168 'library%': 'static_library',
161 169
162 # Override branding to select the desired branding flavor. 170 # Override branding to select the desired branding flavor.
163 'branding%': 'Chromium', 171 'branding%': 'Chromium',
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 ['chromeos==1', { 553 ['chromeos==1', {
546 # When building for ChromeOS we dont want Chromium to use libjpeg_turb o. 554 # When building for ChromeOS we dont want Chromium to use libjpeg_turb o.
547 'use_libjpeg_turbo%': 0, 555 'use_libjpeg_turbo%': 0,
548 }], 556 }],
549 557
550 ['OS=="android"', { 558 ['OS=="android"', {
551 # When building as part of the Android system, use system libraries 559 # When building as part of the Android system, use system libraries
552 # where possible to reduce ROM size. 560 # where possible to reduce ROM size.
553 'use_system_libjpeg%': '<(android_build_type)', 561 'use_system_libjpeg%': '<(android_build_type)',
554 }], 562 }],
563
564 # Enable Settings App only on Windows.
565 ['enable_app_list==1 and OS=="win"', {
566 'enable_settings_app%': 1,
567 }, {
568 'enable_settings_app%': 0,
569 }],
555 ], 570 ],
556 571
557 # Set this to 1 to use the Google-internal file containing 572 # Set this to 1 to use the Google-internal file containing
558 # official API keys for Google Chrome even in a developer build. 573 # official API keys for Google Chrome even in a developer build.
559 # Setting this variable explicitly to 1 will cause your build to 574 # Setting this variable explicitly to 1 will cause your build to
560 # fail if the internal file is missing. 575 # fail if the internal file is missing.
561 # 576 #
562 # Set this to 0 to not use the internal file, even when it 577 # Set this to 0 to not use the internal file, even when it
563 # exists in your checkout. 578 # exists in your checkout.
564 # 579 #
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 'enable_language_detection%': '<(enable_language_detection)', 677 'enable_language_detection%': '<(enable_language_detection)',
663 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 678 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
664 'disable_ftp_support%': '<(disable_ftp_support)', 679 'disable_ftp_support%': '<(disable_ftp_support)',
665 'enable_task_manager%': '<(enable_task_manager)', 680 'enable_task_manager%': '<(enable_task_manager)',
666 'sas_dll_path%': '<(sas_dll_path)', 681 'sas_dll_path%': '<(sas_dll_path)',
667 'wix_path%': '<(wix_path)', 682 'wix_path%': '<(wix_path)',
668 'android_upstream_bringup%': '<(android_upstream_bringup)', 683 'android_upstream_bringup%': '<(android_upstream_bringup)',
669 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 684 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
670 'use_system_libjpeg%': '<(use_system_libjpeg)', 685 'use_system_libjpeg%': '<(use_system_libjpeg)',
671 'android_build_type%': '<(android_build_type)', 686 'android_build_type%': '<(android_build_type)',
687 'enable_app_list%': '<(enable_app_list)',
688 'enable_settings_app%': '<(enable_settings_app)',
672 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 689 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
673 'google_api_key%': '<(google_api_key)', 690 'google_api_key%': '<(google_api_key)',
674 'google_default_client_id%': '<(google_default_client_id)', 691 'google_default_client_id%': '<(google_default_client_id)',
675 'google_default_client_secret%': '<(google_default_client_secret)', 692 'google_default_client_secret%': '<(google_default_client_secret)',
676 693
677 # Use system protobuf instead of bundled one. 694 # Use system protobuf instead of bundled one.
678 'use_system_protobuf%': 0, 695 'use_system_protobuf%': 0,
679 696
680 # Use system yasm instead of bundled one. 697 # Use system yasm instead of bundled one.
681 'use_system_yasm%': 0, 698 'use_system_yasm%': 0,
(...skipping 638 matching lines...) Expand 10 before | Expand all | Expand 10 after
1320 }], 1337 }],
1321 ['enable_printing==1', { 1338 ['enable_printing==1', {
1322 'grit_defines': ['-D', 'enable_printing'], 1339 'grit_defines': ['-D', 'enable_printing'],
1323 }], 1340 }],
1324 ['enable_themes==1', { 1341 ['enable_themes==1', {
1325 'grit_defines': ['-D', 'enable_themes'], 1342 'grit_defines': ['-D', 'enable_themes'],
1326 }], 1343 }],
1327 ['use_oem_wallpaper==1', { 1344 ['use_oem_wallpaper==1', {
1328 'grit_defines': ['-D', 'use_oem_wallpaper'], 1345 'grit_defines': ['-D', 'use_oem_wallpaper'],
1329 }], 1346 }],
1347 ['enable_settings_app==1', {
1348 'grit_defines': ['-D', 'enable_settings_app'],
1349 }],
1330 ['clang_use_chrome_plugins==1 and OS!="win"', { 1350 ['clang_use_chrome_plugins==1 and OS!="win"', {
1331 'clang_chrome_plugins_flags': [ 1351 'clang_chrome_plugins_flags': [
1332 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' 1352 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)'
1333 ], 1353 ],
1334 }], 1354 }],
1335 1355
1336 ['enable_web_intents_tag==1', { 1356 ['enable_web_intents_tag==1', {
1337 'grit_defines': ['-D', 'enable_web_intents_tag'], 1357 'grit_defines': ['-D', 'enable_web_intents_tag'],
1338 }], 1358 }],
1339 1359
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
1812 }], 1832 }],
1813 ['enable_language_detection==1', { 1833 ['enable_language_detection==1', {
1814 'defines': ['ENABLE_LANGUAGE_DETECTION=1'], 1834 'defines': ['ENABLE_LANGUAGE_DETECTION=1'],
1815 }], 1835 }],
1816 ['enable_printing==1', { 1836 ['enable_printing==1', {
1817 'defines': ['ENABLE_PRINTING=1'], 1837 'defines': ['ENABLE_PRINTING=1'],
1818 }], 1838 }],
1819 ['enable_captive_portal_detection==1', { 1839 ['enable_captive_portal_detection==1', {
1820 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'], 1840 'defines': ['ENABLE_CAPTIVE_PORTAL_DETECTION=1'],
1821 }], 1841 }],
1842 ['enable_app_list==1', {
1843 'defines': ['ENABLE_APP_LIST=1'],
1844 }],
1845 ['enable_settings_app==1', {
1846 'defines': ['ENABLE_SETTINGS_APP=1'],
1847 }],
1822 ['disable_ftp_support==1', { 1848 ['disable_ftp_support==1', {
1823 'defines': ['DISABLE_FTP_SUPPORT=1'], 1849 'defines': ['DISABLE_FTP_SUPPORT=1'],
1824 }], 1850 }],
1825 ], # conditions for 'target_defaults' 1851 ], # conditions for 'target_defaults'
1826 'target_conditions': [ 1852 'target_conditions': [
1827 ['enable_wexit_time_destructors==1', { 1853 ['enable_wexit_time_destructors==1', {
1828 'conditions': [ 1854 'conditions': [
1829 [ 'clang==1', { 1855 [ 'clang==1', {
1830 'cflags': [ 1856 'cflags': [
1831 '-Wexit-time-destructors', 1857 '-Wexit-time-destructors',
(...skipping 1901 matching lines...) Expand 10 before | Expand all | Expand 10 after
3733 # settings in target dicts. SYMROOT is a special case, because many other 3759 # settings in target dicts. SYMROOT is a special case, because many other
3734 # Xcode variables depend on it, including variables such as 3760 # Xcode variables depend on it, including variables such as
3735 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3761 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3736 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3762 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3737 # files to appear (when present) in the UI as actual files and not red 3763 # files to appear (when present) in the UI as actual files and not red
3738 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3764 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3739 # and therefore SYMROOT, needs to be set at the project level. 3765 # and therefore SYMROOT, needs to be set at the project level.
3740 'SYMROOT': '<(DEPTH)/xcodebuild', 3766 'SYMROOT': '<(DEPTH)/xcodebuild',
3741 }, 3767 },
3742 } 3768 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/theme/theme_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698