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

Side by Side Diff: build/common.gypi

Issue 109013004: Use icudat*.dat file on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add icudtl.dat only when icu_use_data_file_flag is set Created 7 years 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
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.
11 'variables': { 11 'variables': {
12 # Putting a variables dict inside another variables dict looks kind of 12 # Putting a variables dict inside another variables dict looks kind of
Mark Mentovai 2013/12/18 19:04:04 At first, I thought that this comment might be wha
13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as 13 # weird. This is done so that 'host_arch', 'chromeos', etc are defined as
14 # variables within the outer variables dict here. This is necessary 14 # variables within the outer variables dict here. This is necessary
15 # to get these variables defined for the conditions within this variables 15 # to get these variables defined for the conditions within this variables
16 # dict that operate on these variables. 16 # dict that operate on these variables.
17 'variables': { 17 'variables': {
18 'variables': { 18 'variables': {
19 'variables': { 19 'variables': {
20 'variables': { 20 'variables': {
21 # Whether we're building a ChromeOS build. 21 # Whether we're building a ChromeOS build.
22 'chromeos%': 0, 22 'chromeos%': 0,
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1295 'sysroot%': '<(sysroot)', 1295 'sysroot%': '<(sysroot)',
1296 'CXX%': '<(CXX)', 1296 'CXX%': '<(CXX)',
1297 }], 1297 }],
1298 # All Chrome builds have breakpad symbols, but only process the 1298 # All Chrome builds have breakpad symbols, but only process the
1299 # symbols from official builds. 1299 # symbols from official builds.
1300 ['(branding=="Chrome" and buildtype=="Official")', { 1300 ['(branding=="Chrome" and buildtype=="Official")', {
1301 'linux_dump_symbols%': 1, 1301 'linux_dump_symbols%': 1,
1302 }], 1302 }],
1303 ], 1303 ],
1304 }], # os_posix==1 and OS!="mac" and OS!="ios" 1304 }], # os_posix==1 and OS!="mac" and OS!="ios"
1305 ['OS=="mac"', {
1306 'icu_use_data_file_flag%': 1,
1307 }], # os=="mac"
1305 ['OS=="ios"', { 1308 ['OS=="ios"', {
1306 'disable_nacl%': 1, 1309 'disable_nacl%': 1,
1307 'enable_background%': 0, 1310 'enable_background%': 0,
1308 'enable_task_manager%': 0, 1311 'enable_task_manager%': 0,
1309 'icu_use_data_file_flag%': 1, 1312 'icu_use_data_file_flag%': 1,
1310 'use_system_libxml%': 1, 1313 'use_system_libxml%': 1,
1311 'use_system_sqlite%': 1, 1314 'use_system_sqlite%': 1,
1312 'locales==': [ 1315 'locales==': [
1313 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX', 1316 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX',
1314 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb', 1317 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb',
(...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after
2197 ['native_discardable_memory==1', { 2200 ['native_discardable_memory==1', {
2198 'defines': ['DISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY'], 2201 'defines': ['DISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY'],
2199 }], 2202 }],
2200 ['native_memory_pressure_signals==1', { 2203 ['native_memory_pressure_signals==1', {
2201 'defines': ['SYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE'], 2204 'defines': ['SYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE'],
2202 }], 2205 }],
2203 ['use_udev==1', { 2206 ['use_udev==1', {
2204 'defines': ['USE_UDEV'], 2207 'defines': ['USE_UDEV'],
2205 }], 2208 }],
2206 ['icu_use_data_file_flag==1', { 2209 ['icu_use_data_file_flag==1', {
2207 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], 2210 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'],
Mark Mentovai 2013/12/18 20:16:07 Thinking about this some more, it really only need
2208 }, { # else icu_use_data_file_flag !=1 2211 }, { # else icu_use_data_file_flag !=1
2209 'conditions': [ 2212 'conditions': [
2210 ['OS=="win"', { 2213 ['OS=="win"', {
2211 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], 2214 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'],
2212 }, { 2215 }, {
2213 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], 2216 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'],
2214 }], 2217 }],
2215 ], 2218 ],
2216 }], 2219 }],
2217 ['fastbuild!=0', { 2220 ['fastbuild!=0', {
(...skipping 2574 matching lines...) Expand 10 before | Expand all | Expand 10 after
4792 # settings in target dicts. SYMROOT is a special case, because many other 4795 # settings in target dicts. SYMROOT is a special case, because many other
4793 # Xcode variables depend on it, including variables such as 4796 # Xcode variables depend on it, including variables such as
4794 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4797 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4795 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4798 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4796 # files to appear (when present) in the UI as actual files and not red 4799 # files to appear (when present) in the UI as actual files and not red
4797 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4800 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4798 # and therefore SYMROOT, needs to be set at the project level. 4801 # and therefore SYMROOT, needs to be set at the project level.
4799 'SYMROOT': '<(DEPTH)/xcodebuild', 4802 'SYMROOT': '<(DEPTH)/xcodebuild',
4800 }, 4803 },
4801 } 4804 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698