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

Side by Side Diff: build/common.gypi

Issue 11419094: Adds use_default_render_theme to common.gypi so that features.gypi can (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: os_poxis -> !win 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 ['OS=="win"', { 134 ['OS=="win"', {
135 'enable_touch_ui%': 1, 135 'enable_touch_ui%': 1,
136 }], 136 }],
137 137
138 # Enable App Launcher only on ChromeOS and Windows for now. 138 # Enable App Launcher only on ChromeOS and Windows for now.
139 ['use_ash==1 or OS=="win"', { 139 ['use_ash==1 or OS=="win"', {
140 'enable_app_list%': 1, 140 'enable_app_list%': 1,
141 }, { 141 }, {
142 'enable_app_list%': 0, 142 'enable_app_list%': 0,
143 }], 143 }],
144
145 ['use_aura==1 or (OS!="win" and OS!="mac" and OS!="ios" and OS!="andro id")', {
146 # TODO(sky): make this 1 when corresponding webkit pieces land.
147 'use_default_render_theme%': 0,
148 }, {
149 'use_default_render_theme%': 0,
150 }],
144 ], 151 ],
145 }, 152 },
146 153
147 # Copy conditionally-set variables out one scope. 154 # Copy conditionally-set variables out one scope.
148 'chromeos%': '<(chromeos)', 155 'chromeos%': '<(chromeos)',
149 'host_arch%': '<(host_arch)', 156 'host_arch%': '<(host_arch)',
150 'toolkit_views%': '<(toolkit_views)', 157 'toolkit_views%': '<(toolkit_views)',
151 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 158 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
152 'use_aura%': '<(use_aura)', 159 'use_aura%': '<(use_aura)',
153 'use_ash%': '<(use_ash)', 160 'use_ash%': '<(use_ash)',
154 'use_openssl%': '<(use_openssl)', 161 'use_openssl%': '<(use_openssl)',
155 'use_ibus%': '<(use_ibus)', 162 'use_ibus%': '<(use_ibus)',
156 'enable_viewport%': '<(enable_viewport)', 163 'enable_viewport%': '<(enable_viewport)',
157 'enable_hidpi%': '<(enable_hidpi)', 164 'enable_hidpi%': '<(enable_hidpi)',
158 'enable_touch_ui%': '<(enable_touch_ui)', 165 'enable_touch_ui%': '<(enable_touch_ui)',
159 'android_upstream_bringup%': '<(android_upstream_bringup)', 166 'android_upstream_bringup%': '<(android_upstream_bringup)',
160 'android_build_type%': '<(android_build_type)', 167 'android_build_type%': '<(android_build_type)',
161 'enable_app_list%': '<(enable_app_list)', 168 'enable_app_list%': '<(enable_app_list)',
169 'use_default_render_theme%': '<(use_default_render_theme)',
162 170
163 # We used to provide a variable for changing how libraries were built. 171 # We used to provide a variable for changing how libraries were built.
164 # This variable remains until we can clean up all the users. 172 # This variable remains until we can clean up all the users.
165 # This needs to be one nested variables dict in so that dependent 173 # This needs to be one nested variables dict in so that dependent
166 # gyp files can make use of it in their outer variables. (Yikes!) 174 # gyp files can make use of it in their outer variables. (Yikes!)
167 # http://code.google.com/p/chromium/issues/detail?id=83308 175 # http://code.google.com/p/chromium/issues/detail?id=83308
168 'library%': 'static_library', 176 'library%': 'static_library',
169 177
170 # Override branding to select the desired branding flavor. 178 # Override branding to select the desired branding flavor.
171 'branding%': 'Chromium', 179 'branding%': 'Chromium',
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 686 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
679 'disable_ftp_support%': '<(disable_ftp_support)', 687 'disable_ftp_support%': '<(disable_ftp_support)',
680 'enable_task_manager%': '<(enable_task_manager)', 688 'enable_task_manager%': '<(enable_task_manager)',
681 'sas_dll_path%': '<(sas_dll_path)', 689 'sas_dll_path%': '<(sas_dll_path)',
682 'wix_path%': '<(wix_path)', 690 'wix_path%': '<(wix_path)',
683 'android_upstream_bringup%': '<(android_upstream_bringup)', 691 'android_upstream_bringup%': '<(android_upstream_bringup)',
684 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 692 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
685 'use_system_libjpeg%': '<(use_system_libjpeg)', 693 'use_system_libjpeg%': '<(use_system_libjpeg)',
686 'android_build_type%': '<(android_build_type)', 694 'android_build_type%': '<(android_build_type)',
687 'enable_app_list%': '<(enable_app_list)', 695 'enable_app_list%': '<(enable_app_list)',
696 'use_default_render_theme%': '<(use_default_render_theme)',
688 'enable_settings_app%': '<(enable_settings_app)', 697 'enable_settings_app%': '<(enable_settings_app)',
689 'use_official_google_api_keys%': '<(use_official_google_api_keys)', 698 'use_official_google_api_keys%': '<(use_official_google_api_keys)',
690 'google_api_key%': '<(google_api_key)', 699 'google_api_key%': '<(google_api_key)',
691 'google_default_client_id%': '<(google_default_client_id)', 700 'google_default_client_id%': '<(google_default_client_id)',
692 'google_default_client_secret%': '<(google_default_client_secret)', 701 'google_default_client_secret%': '<(google_default_client_secret)',
693 702
694 # Use system protobuf instead of bundled one. 703 # Use system protobuf instead of bundled one.
695 'use_system_protobuf%': 0, 704 'use_system_protobuf%': 0,
696 705
697 # Use system yasm instead of bundled one. 706 # Use system yasm instead of bundled one.
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
1587 }], 1596 }],
1588 ['ui_compositor_image_transport==1', { 1597 ['ui_compositor_image_transport==1', {
1589 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], 1598 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'],
1590 }], 1599 }],
1591 ['use_aura==1', { 1600 ['use_aura==1', {
1592 'defines': ['USE_AURA=1'], 1601 'defines': ['USE_AURA=1'],
1593 }], 1602 }],
1594 ['use_ash==1', { 1603 ['use_ash==1', {
1595 'defines': ['USE_ASH=1'], 1604 'defines': ['USE_ASH=1'],
1596 }], 1605 }],
1606 ['use_default_render_theme==1', {
1607 'defines': ['USE_DEFAULT_RENDER_THEME=1'],
1608 }],
1597 ['use_libjpeg_turbo==1', { 1609 ['use_libjpeg_turbo==1', {
1598 'defines': ['USE_LIBJPEG_TURBO=1'], 1610 'defines': ['USE_LIBJPEG_TURBO=1'],
1599 }], 1611 }],
1600 ['use_nss==1', { 1612 ['use_nss==1', {
1601 'defines': ['USE_NSS=1'], 1613 'defines': ['USE_NSS=1'],
1602 }], 1614 }],
1603 ['enable_one_click_signin==1', { 1615 ['enable_one_click_signin==1', {
1604 'defines': ['ENABLE_ONE_CLICK_SIGNIN'], 1616 'defines': ['ENABLE_ONE_CLICK_SIGNIN'],
1605 }], 1617 }],
1606 ['toolkit_uses_gtk==1 and toolkit_views==0', { 1618 ['toolkit_uses_gtk==1 and toolkit_views==0', {
(...skipping 2204 matching lines...) Expand 10 before | Expand all | Expand 10 after
3811 # settings in target dicts. SYMROOT is a special case, because many other 3823 # settings in target dicts. SYMROOT is a special case, because many other
3812 # Xcode variables depend on it, including variables such as 3824 # Xcode variables depend on it, including variables such as
3813 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3825 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3814 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3826 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3815 # files to appear (when present) in the UI as actual files and not red 3827 # files to appear (when present) in the UI as actual files and not red
3816 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3828 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3817 # and therefore SYMROOT, needs to be set at the project level. 3829 # and therefore SYMROOT, needs to be set at the project level.
3818 'SYMROOT': '<(DEPTH)/xcodebuild', 3830 'SYMROOT': '<(DEPTH)/xcodebuild',
3819 }, 3831 },
3820 } 3832 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698