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

Side by Side Diff: build/common.gypi

Issue 166513002: Revert of Revert of Revert of Revert of Turn on icu_use_data_file_flag on CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 | no next file » | 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 1314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1325 }], 1325 }],
1326 # All Chrome builds have breakpad symbols, but only process the 1326 # All Chrome builds have breakpad symbols, but only process the
1327 # symbols from official builds. 1327 # symbols from official builds.
1328 ['(branding=="Chrome" and buildtype=="Official")', { 1328 ['(branding=="Chrome" and buildtype=="Official")', {
1329 'linux_dump_symbols%': 1, 1329 'linux_dump_symbols%': 1,
1330 1330
1331 # Omit unwind support in official release builds to save space. We 1331 # Omit unwind support in official release builds to save space. We
1332 # can use breakpad for these builds. 1332 # can use breakpad for these builds.
1333 'release_unwind_tables%': 0, 1333 'release_unwind_tables%': 0,
1334 }], 1334 }],
1335 # TODO(jungshik): Turn this on on Android and Chrome OS 1335 # TODO(jungshik): Turn this on on Android.
1336 ['OS!="android" and chromeos==0', { 1336 # For ChromeOS, this should be turned on in chromeos-chrome.ebuild
1337 # file as well by adding icu_use_data_file_flag=1 to BUILD_DEFINES.
1338 ['OS!="android"', {
1337 'icu_use_data_file_flag%': 1, 1339 'icu_use_data_file_flag%': 1,
1338 }], 1340 }],
1339 ], 1341 ],
1340 }], # os_posix==1 and OS!="mac" and OS!="ios" 1342 }], # os_posix==1 and OS!="mac" and OS!="ios"
1341 ['OS=="mac"', { 1343 ['OS=="mac"', {
1342 'icu_use_data_file_flag%': 1, 1344 'icu_use_data_file_flag%': 1,
1343 }], # os=="mac" 1345 }], # os=="mac"
1344 ['OS=="ios"', { 1346 ['OS=="ios"', {
1345 'disable_nacl%': 1, 1347 'disable_nacl%': 1,
1346 'enable_background%': 0, 1348 'enable_background%': 0,
(...skipping 3624 matching lines...) Expand 10 before | Expand all | Expand 10 after
4971 # settings in target dicts. SYMROOT is a special case, because many other 4973 # settings in target dicts. SYMROOT is a special case, because many other
4972 # Xcode variables depend on it, including variables such as 4974 # Xcode variables depend on it, including variables such as
4973 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4975 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4974 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4976 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4975 # files to appear (when present) in the UI as actual files and not red 4977 # files to appear (when present) in the UI as actual files and not red
4976 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4978 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4977 # and therefore SYMROOT, needs to be set at the project level. 4979 # and therefore SYMROOT, needs to be set at the project level.
4978 'SYMROOT': '<(DEPTH)/xcodebuild', 4980 'SYMROOT': '<(DEPTH)/xcodebuild',
4979 }, 4981 },
4980 } 4982 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698