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 203163003: Use the system provided harfbuzz on chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | build/linux/check_return_value » ('j') | build/linux/check_return_value » ('J')
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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 # The system libdir used for this ABI. 290 # The system libdir used for this ABI.
291 'system_libdir%': 'lib', 291 'system_libdir%': 'lib',
292 292
293 # Use libjpeg-turbo as the JPEG codec used by Chromium. 293 # Use libjpeg-turbo as the JPEG codec used by Chromium.
294 'use_libjpeg_turbo%': 1, 294 'use_libjpeg_turbo%': 1,
295 295
296 # Use system libjpeg. Note that the system's libjepg will be used even if 296 # Use system libjpeg. Note that the system's libjepg will be used even if
297 # use_libjpeg_turbo is set. 297 # use_libjpeg_turbo is set.
298 'use_system_libjpeg%': 0, 298 'use_system_libjpeg%': 0,
299 299
300 # Use system libharfbuzz-ng.
301 'use_system_harfbuzz%': 0,
302
300 # By default, component is set to static_library and it can be overriden 303 # By default, component is set to static_library and it can be overriden
301 # by the GYP command line or by ~/.gyp/include.gypi. 304 # by the GYP command line or by ~/.gyp/include.gypi.
302 'component%': 'static_library', 305 'component%': 'static_library',
303 306
304 # Set to select the Title Case versions of strings in GRD files. 307 # Set to select the Title Case versions of strings in GRD files.
305 'use_titlecase_in_grd_files%': 0, 308 'use_titlecase_in_grd_files%': 0,
306 309
307 # Use translations provided by volunteers at launchpad.net. This 310 # Use translations provided by volunteers at launchpad.net. This
308 # currently only works on Linux. 311 # currently only works on Linux.
309 'use_third_party_translations%': 0, 312 'use_third_party_translations%': 0,
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 # 733 #
731 # On Aura, this allows per-tile painting to be used in the browser 734 # On Aura, this allows per-tile painting to be used in the browser
732 # compositor. 735 # compositor.
733 ['OS!="android"', { 736 ['OS!="android"', {
734 'use_canvas_skia%': 1, 737 'use_canvas_skia%': 1,
735 }], 738 }],
736 739
737 ['chromeos==1', { 740 ['chromeos==1', {
738 # When building for ChromeOS we dont want Chromium to use libjpeg_turb o. 741 # When building for ChromeOS we dont want Chromium to use libjpeg_turb o.
739 'use_libjpeg_turbo%': 0, 742 'use_libjpeg_turbo%': 0,
743
744 # On ChromeOS, we use the system libharfbuzz-ng.
Nico 2014/03/18 15:12:13 Probably better to answer "why?" than "what?" here
jochen (gone - plz use gerrit) 2014/03/18 15:39:37 Done.
745 'use_system_harfbuzz%': 1,
740 }], 746 }],
741 747
742 ['OS=="android"', { 748 ['OS=="android"', {
743 # When building as part of the Android system, use system libraries 749 # When building as part of the Android system, use system libraries
744 # where possible to reduce ROM size. 750 # where possible to reduce ROM size.
745 'use_system_libjpeg%': '<(android_webview_build)', 751 'use_system_libjpeg%': '<(android_webview_build)',
746 }], 752 }],
747 753
748 # Do not enable the Settings App on ChromeOS. 754 # Do not enable the Settings App on ChromeOS.
749 ['enable_app_list==1 and chromeos==0', { 755 ['enable_app_list==1 and chromeos==0', {
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 'enable_spellcheck%': '<(enable_spellcheck)', 980 'enable_spellcheck%': '<(enable_spellcheck)',
975 'enable_google_now%': '<(enable_google_now)', 981 'enable_google_now%': '<(enable_google_now)',
976 'cld_version%': '<(cld_version)', 982 'cld_version%': '<(cld_version)',
977 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)', 983 'enable_captive_portal_detection%': '<(enable_captive_portal_detection)',
978 'disable_ftp_support%': '<(disable_ftp_support)', 984 'disable_ftp_support%': '<(disable_ftp_support)',
979 'enable_task_manager%': '<(enable_task_manager)', 985 'enable_task_manager%': '<(enable_task_manager)',
980 'sas_dll_path%': '<(sas_dll_path)', 986 'sas_dll_path%': '<(sas_dll_path)',
981 'wix_path%': '<(wix_path)', 987 'wix_path%': '<(wix_path)',
982 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)', 988 'use_libjpeg_turbo%': '<(use_libjpeg_turbo)',
983 'use_system_libjpeg%': '<(use_system_libjpeg)', 989 'use_system_libjpeg%': '<(use_system_libjpeg)',
990 'use_system_harfbuzz%': '<(use_system_harfbuzz)',
984 'android_webview_build%': '<(android_webview_build)', 991 'android_webview_build%': '<(android_webview_build)',
985 'icu_use_data_file_flag%': '<(icu_use_data_file_flag)', 992 'icu_use_data_file_flag%': '<(icu_use_data_file_flag)',
986 'gyp_managed_install%': 0, 993 'gyp_managed_install%': 0,
987 'create_standalone_apk%': 1, 994 'create_standalone_apk%': 1,
988 'enable_app_list%': '<(enable_app_list)', 995 'enable_app_list%': '<(enable_app_list)',
989 'use_default_render_theme%': '<(use_default_render_theme)', 996 'use_default_render_theme%': '<(use_default_render_theme)',
990 'enable_settings_app%': '<(enable_settings_app)', 997 'enable_settings_app%': '<(enable_settings_app)',
991 'google_api_key%': '<(google_api_key)', 998 'google_api_key%': '<(google_api_key)',
992 'google_default_client_id%': '<(google_default_client_id)', 999 'google_default_client_id%': '<(google_default_client_id)',
993 'google_default_client_secret%': '<(google_default_client_secret)', 1000 'google_default_client_secret%': '<(google_default_client_secret)',
(...skipping 1978 matching lines...) Expand 10 before | Expand all | Expand 10 after
2972 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'], 2979 'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
2973 }, 2980 },
2974 'Release_x64': { 2981 'Release_x64': {
2975 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'], 2982 'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
2976 }, 2983 },
2977 }], 2984 }],
2978 ], 2985 ],
2979 }, 2986 },
2980 }, 2987 },
2981 'conditions': [ 2988 'conditions': [
2982 # TODO(jochen): Enable this on chromeos. http://crbug.com/353127 2989 ['os_posix==1', {
2983 ['os_posix==1 and chromeos==0', {
Nico 2014/03/18 15:12:13 Mention that you're also turning on linker-warning
jochen (gone - plz use gerrit) 2014/03/18 15:39:37 Done.
2984 'target_defaults': { 2990 'target_defaults': {
2985 'ldflags': [ 2991 'ldflags': [
2986 '-Wl,--fatal-warnings', 2992 '-Wl,--fatal-warnings',
2987 '-Wl,-z,now', 2993 '-Wl,-z,now',
2988 '-Wl,-z,relro', 2994 '-Wl,-z,relro',
2989 ], 2995 ],
2990 }, 2996 },
2991 }], 2997 }],
2992 ['os_posix==1 and chromeos==0', { 2998 ['os_posix==1 and chromeos==0', {
2993 # Chrome OS enables -fstack-protector-strong via its build wrapper, 2999 # Chrome OS enables -fstack-protector-strong via its build wrapper,
(...skipping 2070 matching lines...) Expand 10 before | Expand all | Expand 10 after
5064 # settings in target dicts. SYMROOT is a special case, because many other 5070 # settings in target dicts. SYMROOT is a special case, because many other
5065 # Xcode variables depend on it, including variables such as 5071 # Xcode variables depend on it, including variables such as
5066 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5072 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5067 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5073 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5068 # files to appear (when present) in the UI as actual files and not red 5074 # files to appear (when present) in the UI as actual files and not red
5069 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5075 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5070 # and therefore SYMROOT, needs to be set at the project level. 5076 # and therefore SYMROOT, needs to be set at the project level.
5071 'SYMROOT': '<(DEPTH)/xcodebuild', 5077 'SYMROOT': '<(DEPTH)/xcodebuild',
5072 }, 5078 },
5073 } 5079 }
OLDNEW
« no previous file with comments | « no previous file | build/linux/check_return_value » ('j') | build/linux/check_return_value » ('J')

Powered by Google App Engine
This is Rietveld 408576698