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

Side by Side Diff: build/common.gypi

Issue 12261058: build: Remove deprecated 'library' variable from common.gypi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 'enable_hidpi%': '<(enable_hidpi)', 170 'enable_hidpi%': '<(enable_hidpi)',
171 'enable_touch_ui%': '<(enable_touch_ui)', 171 'enable_touch_ui%': '<(enable_touch_ui)',
172 'android_build_type%': '<(android_build_type)', 172 'android_build_type%': '<(android_build_type)',
173 'google_tv%': '<(google_tv)', 173 'google_tv%': '<(google_tv)',
174 'enable_app_list%': '<(enable_app_list)', 174 'enable_app_list%': '<(enable_app_list)',
175 'enable_message_center%': '<(enable_message_center)', 175 'enable_message_center%': '<(enable_message_center)',
176 'use_default_render_theme%': '<(use_default_render_theme)', 176 'use_default_render_theme%': '<(use_default_render_theme)',
177 'enable_web_intents%': 0, # TODO(thakis): Remove, http://crbug.com/173194 177 'enable_web_intents%': 0, # TODO(thakis): Remove, http://crbug.com/173194
178 'buildtype%': '<(buildtype)', 178 'buildtype%': '<(buildtype)',
179 179
180 # We used to provide a variable for changing how libraries were built.
181 # This variable remains until we can clean up all the users.
182 # This needs to be one nested variables dict in so that dependent
183 # gyp files can make use of it in their outer variables. (Yikes!)
184 # http://code.google.com/p/chromium/issues/detail?id=83308
185 'library%': 'static_library',
186
187 # Override branding to select the desired branding flavor. 180 # Override branding to select the desired branding flavor.
188 'branding%': 'Chromium', 181 'branding%': 'Chromium',
189 182
190 # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are 183 # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are
191 # are built under a chromium full build (1) or a webkit.org chromium 184 # are built under a chromium full build (1) or a webkit.org chromium
192 # build (0). 185 # build (0).
193 'inside_chromium_build%': 1, 186 'inside_chromium_build%': 1,
194 187
195 # Set to 1 to enable fast builds. It disables debug info for fastest 188 # Set to 1 to enable fast builds. It disables debug info for fastest
196 # compilation. 189 # compilation.
(...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 'google_api_key%': '', 648 'google_api_key%': '',
656 'google_default_client_id%': '', 649 'google_default_client_id%': '',
657 'google_default_client_secret%': '', 650 'google_default_client_secret%': '',
658 }, 651 },
659 652
660 # Copy conditionally-set variables out one scope. 653 # Copy conditionally-set variables out one scope.
661 'branding%': '<(branding)', 654 'branding%': '<(branding)',
662 'buildtype%': '<(buildtype)', 655 'buildtype%': '<(buildtype)',
663 'target_arch%': '<(target_arch)', 656 'target_arch%': '<(target_arch)',
664 'host_arch%': '<(host_arch)', 657 'host_arch%': '<(host_arch)',
665 'library%': 'static_library',
666 'toolkit_views%': '<(toolkit_views)', 658 'toolkit_views%': '<(toolkit_views)',
667 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)', 659 'ui_compositor_image_transport%': '<(ui_compositor_image_transport)',
668 'use_aura%': '<(use_aura)', 660 'use_aura%': '<(use_aura)',
669 'use_ash%': '<(use_ash)', 661 'use_ash%': '<(use_ash)',
670 'use_openssl%': '<(use_openssl)', 662 'use_openssl%': '<(use_openssl)',
671 'use_nss%': '<(use_nss)', 663 'use_nss%': '<(use_nss)',
672 'os_bsd%': '<(os_bsd)', 664 'os_bsd%': '<(os_bsd)',
673 'os_posix%': '<(os_posix)', 665 'os_posix%': '<(os_posix)',
674 'use_glib%': '<(use_glib)', 666 'use_glib%': '<(use_glib)',
675 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 667 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
(...skipping 3364 matching lines...) Expand 10 before | Expand all | Expand 10 after
4040 # settings in target dicts. SYMROOT is a special case, because many other 4032 # settings in target dicts. SYMROOT is a special case, because many other
4041 # Xcode variables depend on it, including variables such as 4033 # Xcode variables depend on it, including variables such as
4042 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4034 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4043 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4035 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4044 # files to appear (when present) in the UI as actual files and not red 4036 # files to appear (when present) in the UI as actual files and not red
4045 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4037 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4046 # and therefore SYMROOT, needs to be set at the project level. 4038 # and therefore SYMROOT, needs to be set at the project level.
4047 'SYMROOT': '<(DEPTH)/xcodebuild', 4039 'SYMROOT': '<(DEPTH)/xcodebuild',
4048 }, 4040 },
4049 } 4041 }
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