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

Side by Side Diff: build/common.gypi

Issue 25351004: Use translator instead of translator_glsl ANGLE dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add a condition 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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 # On Linux, we build with sse2 for Chromium builds. 243 # On Linux, we build with sse2 for Chromium builds.
244 'disable_sse2%': 0, 244 'disable_sse2%': 0,
245 245
246 # Use libjpeg-turbo as the JPEG codec used by Chromium. 246 # Use libjpeg-turbo as the JPEG codec used by Chromium.
247 'use_libjpeg_turbo%': 1, 247 'use_libjpeg_turbo%': 1,
248 248
249 # Use system libjpeg. Note that the system's libjepg will be used even if 249 # Use system libjpeg. Note that the system's libjepg will be used even if
250 # use_libjpeg_turbo is set. 250 # use_libjpeg_turbo is set.
251 'use_system_libjpeg%': 0, 251 'use_system_libjpeg%': 0,
252 252
253 # Use ANGLE target translator instead of translator_glsl.
254 # TODO(zmo): clean this up when both chromium and webkit switch over.
255 'use_angle_translator%': 0,
256
253 # By default, component is set to static_library and it can be overriden 257 # By default, component is set to static_library and it can be overriden
254 # by the GYP command line or by ~/.gyp/include.gypi. 258 # by the GYP command line or by ~/.gyp/include.gypi.
255 'component%': 'static_library', 259 'component%': 'static_library',
256 260
257 # Set to select the Title Case versions of strings in GRD files. 261 # Set to select the Title Case versions of strings in GRD files.
258 'use_titlecase_in_grd_files%': 0, 262 'use_titlecase_in_grd_files%': 0,
259 263
260 # Use translations provided by volunteers at launchpad.net. This 264 # Use translations provided by volunteers at launchpad.net. This
261 # currently only works on Linux. 265 # currently only works on Linux.
262 'use_third_party_translations%': 0, 266 'use_third_party_translations%': 0,
(...skipping 609 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 'enable_spellcheck%': '<(enable_spellcheck)', 876 'enable_spellcheck%': '<(enable_spellcheck)',
873 'enable_google_now%': '<(enable_google_now)', 877 'enable_google_now%': '<(enable_google_now)',
874 'cld_version%': '<(cld_version)', 878 'cld_version%': '<(cld_version)',
875 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 879 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
876 'disable_ftp_support%': '<(disable_ftp_support)', 880 'disable_ftp_support%': '<(disable_ftp_support)',
877 'enable_task_manager%': '<(enable_task_manager)', 881 'enable_task_manager%': '<(enable_task_manager)',
878 'sas_dll_path%': '<(sas_dll_path)', 882 'sas_dll_path%': '<(sas_dll_path)',
879 'wix_path%': '<(wix_path)', 883 'wix_path%': '<(wix_path)',
880 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 884 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
881 'use_system_libjpeg%': '<(use_system_libjpeg)', 885 'use_system_libjpeg%': '<(use_system_libjpeg)',
886 'use_angle_translator%': '<(use_angle_translator)',
882 'android_webview_build%': '<(android_webview_build)', 887 'android_webview_build%': '<(android_webview_build)',
883 'gyp_managed_install%': 0, 888 'gyp_managed_install%': 0,
884 'create_standalone_apk%': 1, 889 'create_standalone_apk%': 1,
885 'google_tv%': '<(google_tv)', 890 'google_tv%': '<(google_tv)',
886 'enable_app_list%': '<(enable_app_list)', 891 'enable_app_list%': '<(enable_app_list)',
887 'use_default_render_theme%': '<(use_default_render_theme)', 892 'use_default_render_theme%': '<(use_default_render_theme)',
888 'enable_settings_app%': '<(enable_settings_app)', 893 'enable_settings_app%': '<(enable_settings_app)',
889 'google_api_key%': '<(google_api_key)', 894 'google_api_key%': '<(google_api_key)',
890 'google_default_client_id%': '<(google_default_client_id)', 895 'google_default_client_id%': '<(google_default_client_id)',
891 'google_default_client_secret%': '<(google_default_client_secret)', 896 'google_default_client_secret%': '<(google_default_client_secret)',
(...skipping 3850 matching lines...) Expand 10 before | Expand all | Expand 10 after
4742 # settings in target dicts. SYMROOT is a special case, because many other 4747 # settings in target dicts. SYMROOT is a special case, because many other
4743 # Xcode variables depend on it, including variables such as 4748 # Xcode variables depend on it, including variables such as
4744 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4749 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4745 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4750 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4746 # files to appear (when present) in the UI as actual files and not red 4751 # files to appear (when present) in the UI as actual files and not red
4747 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4752 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4748 # and therefore SYMROOT, needs to be set at the project level. 4753 # and therefore SYMROOT, needs to be set at the project level.
4749 'SYMROOT': '<(DEPTH)/xcodebuild', 4754 'SYMROOT': '<(DEPTH)/xcodebuild',
4750 }, 4755 },
4751 } 4756 }
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