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

Side by Side Diff: build/common.gypi

Issue 26315004: Remove the use_angle_translator condition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | gpu/command_buffer_service.gypi » ('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 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 # On Linux, we build with sse2 for Chromium builds. 238 # On Linux, we build with sse2 for Chromium builds.
239 'disable_sse2%': 0, 239 'disable_sse2%': 0,
240 240
241 # Use libjpeg-turbo as the JPEG codec used by Chromium. 241 # Use libjpeg-turbo as the JPEG codec used by Chromium.
242 'use_libjpeg_turbo%': 1, 242 'use_libjpeg_turbo%': 1,
243 243
244 # Use system libjpeg. Note that the system's libjepg will be used even if 244 # Use system libjpeg. Note that the system's libjepg will be used even if
245 # use_libjpeg_turbo is set. 245 # use_libjpeg_turbo is set.
246 'use_system_libjpeg%': 0, 246 'use_system_libjpeg%': 0,
247 247
248 # Use ANGLE target translator instead of translator_glsl.
249 # TODO(zmo): clean this up when both chromium and webkit switch over.
250 'use_angle_translator%': 1,
251
252 # By default, component is set to static_library and it can be overriden 248 # By default, component is set to static_library and it can be overriden
253 # by the GYP command line or by ~/.gyp/include.gypi. 249 # by the GYP command line or by ~/.gyp/include.gypi.
254 'component%': 'static_library', 250 'component%': 'static_library',
255 251
256 # Set to select the Title Case versions of strings in GRD files. 252 # Set to select the Title Case versions of strings in GRD files.
257 'use_titlecase_in_grd_files%': 0, 253 'use_titlecase_in_grd_files%': 0,
258 254
259 # Use translations provided by volunteers at launchpad.net. This 255 # Use translations provided by volunteers at launchpad.net. This
260 # currently only works on Linux. 256 # currently only works on Linux.
261 'use_third_party_translations%': 0, 257 'use_third_party_translations%': 0,
(...skipping 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 'enable_spellcheck%': '<(enable_spellcheck)', 858 'enable_spellcheck%': '<(enable_spellcheck)',
863 'enable_google_now%': '<(enable_google_now)', 859 'enable_google_now%': '<(enable_google_now)',
864 'cld_version%': '<(cld_version)', 860 'cld_version%': '<(cld_version)',
865 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 861 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
866 'disable_ftp_support%': '<(disable_ftp_support)', 862 'disable_ftp_support%': '<(disable_ftp_support)',
867 'enable_task_manager%': '<(enable_task_manager)', 863 'enable_task_manager%': '<(enable_task_manager)',
868 'sas_dll_path%': '<(sas_dll_path)', 864 'sas_dll_path%': '<(sas_dll_path)',
869 'wix_path%': '<(wix_path)', 865 'wix_path%': '<(wix_path)',
870 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 866 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
871 'use_system_libjpeg%': '<(use_system_libjpeg)', 867 'use_system_libjpeg%': '<(use_system_libjpeg)',
872 'use_angle_translator%': '<(use_angle_translator)',
873 'android_webview_build%': '<(android_webview_build)', 868 'android_webview_build%': '<(android_webview_build)',
874 'gyp_managed_install%': 0, 869 'gyp_managed_install%': 0,
875 'create_standalone_apk%': 1, 870 'create_standalone_apk%': 1,
876 'google_tv%': '<(google_tv)', 871 'google_tv%': '<(google_tv)',
877 'enable_app_list%': '<(enable_app_list)', 872 'enable_app_list%': '<(enable_app_list)',
878 'use_default_render_theme%': '<(use_default_render_theme)', 873 'use_default_render_theme%': '<(use_default_render_theme)',
879 'enable_settings_app%': '<(enable_settings_app)', 874 'enable_settings_app%': '<(enable_settings_app)',
880 'google_api_key%': '<(google_api_key)', 875 'google_api_key%': '<(google_api_key)',
881 'google_default_client_id%': '<(google_default_client_id)', 876 'google_default_client_id%': '<(google_default_client_id)',
882 'google_default_client_secret%': '<(google_default_client_secret)', 877 'google_default_client_secret%': '<(google_default_client_secret)',
(...skipping 3845 matching lines...) Expand 10 before | Expand all | Expand 10 after
4728 # settings in target dicts. SYMROOT is a special case, because many other 4723 # settings in target dicts. SYMROOT is a special case, because many other
4729 # Xcode variables depend on it, including variables such as 4724 # Xcode variables depend on it, including variables such as
4730 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4725 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4731 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4726 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4732 # files to appear (when present) in the UI as actual files and not red 4727 # files to appear (when present) in the UI as actual files and not red
4733 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4728 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4734 # and therefore SYMROOT, needs to be set at the project level. 4729 # and therefore SYMROOT, needs to be set at the project level.
4735 'SYMROOT': '<(DEPTH)/xcodebuild', 4730 'SYMROOT': '<(DEPTH)/xcodebuild',
4736 }, 4731 },
4737 } 4732 }
OLDNEW
« no previous file with comments | « no previous file | gpu/command_buffer_service.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698