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

Side by Side Diff: build/common.gypi

Issue 126753003: Use third_party/fontconfig for embedded builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/system.gyp » ('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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 # Embedded implies ozone. 106 # Embedded implies ozone.
107 ['embedded==1', { 107 ['embedded==1', {
108 'use_ozone%': 1, 108 'use_ozone%': 1,
109 }], 109 }],
110 110
111 ['OS=="android"', { 111 ['OS=="android"', {
112 'android_goma_dir%': '<!(echo "${GOMA_DIR}")', 112 'android_goma_dir%': '<!(echo "${GOMA_DIR}")',
113 }, { 113 }, {
114 'android_goma_dir%': '' 114 'android_goma_dir%': ''
115 }], 115 }],
116
117 ['embedded==1', {
118 'use_system_fontconfig%': 0,
119 }, {
120 'use_system_fontconfig%': 1,
121 }],
116 ], 122 ],
117 }, 123 },
118 # Copy conditionally-set variables out one scope. 124 # Copy conditionally-set variables out one scope.
119 'chromeos%': '<(chromeos)', 125 'chromeos%': '<(chromeos)',
120 'desktop_linux%': '<(desktop_linux)', 126 'desktop_linux%': '<(desktop_linux)',
121 'use_aura%': '<(use_aura)', 127 'use_aura%': '<(use_aura)',
122 'use_ash%': '<(use_ash)', 128 'use_ash%': '<(use_ash)',
123 'use_cras%': '<(use_cras)', 129 'use_cras%': '<(use_cras)',
124 'use_ozone%': '<(use_ozone)', 130 'use_ozone%': '<(use_ozone)',
125 'embedded%': '<(embedded)', 131 'embedded%': '<(embedded)',
126 'use_openssl%': '<(use_openssl)', 132 'use_openssl%': '<(use_openssl)',
133 'use_system_fontconfig%': '<(use_system_fontconfig)',
127 'enable_viewport%': '<(enable_viewport)', 134 'enable_viewport%': '<(enable_viewport)',
128 'enable_hidpi%': '<(enable_hidpi)', 135 'enable_hidpi%': '<(enable_hidpi)',
129 'enable_touch_ui%': '<(enable_touch_ui)', 136 'enable_touch_ui%': '<(enable_touch_ui)',
130 'buildtype%': '<(buildtype)', 137 'buildtype%': '<(buildtype)',
131 'branding%': '<(branding)', 138 'branding%': '<(branding)',
132 'host_arch%': '<(host_arch)', 139 'host_arch%': '<(host_arch)',
133 140
134 # Default architecture we're building for is the architecture we're 141 # Default architecture we're building for is the architecture we're
135 # building on. 142 # building on.
136 'target_arch%': '<(host_arch)', 143 'target_arch%': '<(host_arch)',
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 242 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
236 'desktop_linux%': '<(desktop_linux)', 243 'desktop_linux%': '<(desktop_linux)',
237 'use_aura%': '<(use_aura)', 244 'use_aura%': '<(use_aura)',
238 'use_ash%': '<(use_ash)', 245 'use_ash%': '<(use_ash)',
239 'use_cras%': '<(use_cras)', 246 'use_cras%': '<(use_cras)',
240 'use_ozone%': '<(use_ozone)', 247 'use_ozone%': '<(use_ozone)',
241 'use_ozone_evdev%': '<(use_ozone_evdev)', 248 'use_ozone_evdev%': '<(use_ozone_evdev)',
242 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 249 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
243 'embedded%': '<(embedded)', 250 'embedded%': '<(embedded)',
244 'use_openssl%': '<(use_openssl)', 251 'use_openssl%': '<(use_openssl)',
252 'use_system_fontconfig%': '<(use_system_fontconfig)',
245 'enable_viewport%': '<(enable_viewport)', 253 'enable_viewport%': '<(enable_viewport)',
246 'enable_hidpi%': '<(enable_hidpi)', 254 'enable_hidpi%': '<(enable_hidpi)',
247 'enable_touch_ui%': '<(enable_touch_ui)', 255 'enable_touch_ui%': '<(enable_touch_ui)',
248 'android_webview_build%': '<(android_webview_build)', 256 'android_webview_build%': '<(android_webview_build)',
249 'google_tv%': '<(google_tv)', 257 'google_tv%': '<(google_tv)',
250 'use_goma%': '<(use_goma)', 258 'use_goma%': '<(use_goma)',
251 'gomadir%': '<(gomadir)', 259 'gomadir%': '<(gomadir)',
252 'enable_app_list%': '<(enable_app_list)', 260 'enable_app_list%': '<(enable_app_list)',
253 'use_default_render_theme%': '<(use_default_render_theme)', 261 'use_default_render_theme%': '<(use_default_render_theme)',
254 'buildtype%': '<(buildtype)', 262 'buildtype%': '<(buildtype)',
(...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 'use_udev%': '<(use_udev)', 888 'use_udev%': '<(use_udev)',
881 'os_bsd%': '<(os_bsd)', 889 'os_bsd%': '<(os_bsd)',
882 'os_posix%': '<(os_posix)', 890 'os_posix%': '<(os_posix)',
883 'use_dbus%': '<(use_dbus)', 891 'use_dbus%': '<(use_dbus)',
884 'use_glib%': '<(use_glib)', 892 'use_glib%': '<(use_glib)',
885 'use_pango%': '<(use_pango)', 893 'use_pango%': '<(use_pango)',
886 'use_cairo%': '<(use_cairo)', 894 'use_cairo%': '<(use_cairo)',
887 'use_ozone%': '<(use_ozone)', 895 'use_ozone%': '<(use_ozone)',
888 'use_ozone_evdev%': '<(use_ozone_evdev)', 896 'use_ozone_evdev%': '<(use_ozone_evdev)',
889 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', 897 'use_clipboard_aurax11%': '<(use_clipboard_aurax11)',
898 'use_system_fontconfig%': '<(use_system_fontconfig)',
890 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 899 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
891 'desktop_linux%': '<(desktop_linux)', 900 'desktop_linux%': '<(desktop_linux)',
892 'use_x11%': '<(use_x11)', 901 'use_x11%': '<(use_x11)',
893 'use_gnome_keyring%': '<(use_gnome_keyring)', 902 'use_gnome_keyring%': '<(use_gnome_keyring)',
894 'linux_fpic%': '<(linux_fpic)', 903 'linux_fpic%': '<(linux_fpic)',
895 'chromeos%': '<(chromeos)', 904 'chromeos%': '<(chromeos)',
896 'enable_viewport%': '<(enable_viewport)', 905 'enable_viewport%': '<(enable_viewport)',
897 'enable_hidpi%': '<(enable_hidpi)', 906 'enable_hidpi%': '<(enable_hidpi)',
898 'enable_touch_ui%': '<(enable_touch_ui)', 907 'enable_touch_ui%': '<(enable_touch_ui)',
899 'use_xi2_mt%':'<(use_xi2_mt)', 908 'use_xi2_mt%':'<(use_xi2_mt)',
(...skipping 3893 matching lines...) Expand 10 before | Expand all | Expand 10 after
4793 # settings in target dicts. SYMROOT is a special case, because many other 4802 # settings in target dicts. SYMROOT is a special case, because many other
4794 # Xcode variables depend on it, including variables such as 4803 # Xcode variables depend on it, including variables such as
4795 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4804 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4796 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4805 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4797 # files to appear (when present) in the UI as actual files and not red 4806 # files to appear (when present) in the UI as actual files and not red
4798 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4807 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4799 # and therefore SYMROOT, needs to be set at the project level. 4808 # and therefore SYMROOT, needs to be set at the project level.
4800 'SYMROOT': '<(DEPTH)/xcodebuild', 4809 'SYMROOT': '<(DEPTH)/xcodebuild',
4801 }, 4810 },
4802 } 4811 }
OLDNEW
« no previous file with comments | « no previous file | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698