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

Side by Side Diff: build/common.gypi

Issue 139403006: Revert of Enable icu_use_data_file on Windows (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 | « base/i18n/icu_util.cc ('k') | chrome/installer/mini_installer.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 1276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1287 }, { 1287 }, {
1288 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0', 1288 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
1289 }], 1289 }],
1290 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', { 1290 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', {
1291 'directx_sdk_path%': '<(directx_sdk_default_path)', 1291 'directx_sdk_path%': '<(directx_sdk_default_path)',
1292 }, { 1292 }, {
1293 'directx_sdk_path%': '$(DXSDK_DIR)', 1293 'directx_sdk_path%': '$(DXSDK_DIR)',
1294 }], 1294 }],
1295 ['OS=="win"', { 1295 ['OS=="win"', {
1296 'windows_driver_kit_path%': '$(WDK_DIR)', 1296 'windows_driver_kit_path%': '$(WDK_DIR)',
1297 'icu_use_data_file_flag%': 1,
1298 }], 1297 }],
1299 ['os_posix==1 and OS!="mac" and OS!="ios"', { 1298 ['os_posix==1 and OS!="mac" and OS!="ios"', {
1300 'conditions': [ 1299 'conditions': [
1301 ['target_arch=="mipsel"', { 1300 ['target_arch=="mipsel"', {
1302 'werror%': '', 1301 'werror%': '',
1303 'disable_nacl%': 1, 1302 'disable_nacl%': 1,
1304 'nacl_untrusted_build%': 0, 1303 'nacl_untrusted_build%': 0,
1305 'linux_use_tcmalloc%': 0, 1304 'linux_use_tcmalloc%': 0,
1306 }], 1305 }],
1307 ['OS=="linux" and target_arch=="mipsel"', { 1306 ['OS=="linux" and target_arch=="mipsel"', {
(...skipping 3527 matching lines...) Expand 10 before | Expand all | Expand 10 after
4835 # settings in target dicts. SYMROOT is a special case, because many other 4834 # settings in target dicts. SYMROOT is a special case, because many other
4836 # Xcode variables depend on it, including variables such as 4835 # Xcode variables depend on it, including variables such as
4837 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4836 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4838 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4837 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4839 # files to appear (when present) in the UI as actual files and not red 4838 # files to appear (when present) in the UI as actual files and not red
4840 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4839 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4841 # and therefore SYMROOT, needs to be set at the project level. 4840 # and therefore SYMROOT, needs to be set at the project level.
4842 'SYMROOT': '<(DEPTH)/xcodebuild', 4841 'SYMROOT': '<(DEPTH)/xcodebuild',
4843 }, 4842 },
4844 } 4843 }
OLDNEW
« no previous file with comments | « base/i18n/icu_util.cc ('k') | chrome/installer/mini_installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698