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

Side by Side Diff: build/common.gypi

Issue 99473012: Enable icu_use_data_file on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: combine 2 conditions into one in base.gyp 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.
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', { 1273 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', {
1274 'directx_sdk_path%': '<(directx_sdk_default_path)', 1274 'directx_sdk_path%': '<(directx_sdk_default_path)',
1275 }, { 1275 }, {
1276 'directx_sdk_path%': '$(DXSDK_DIR)', 1276 'directx_sdk_path%': '$(DXSDK_DIR)',
1277 }], 1277 }],
1278 ['OS=="win"', { 1278 ['OS=="win"', {
1279 'windows_driver_kit_path%': '$(WDK_DIR)', 1279 'windows_driver_kit_path%': '$(WDK_DIR)',
1280 # Set the python arch to prevent conflicts with pyauto on Win64 build. 1280 # Set the python arch to prevent conflicts with pyauto on Win64 build.
1281 # TODO(jschuh): crbug.com/177664 Investigate Win64 pyauto build. 1281 # TODO(jschuh): crbug.com/177664 Investigate Win64 pyauto build.
1282 'python_arch%': 'ia32', 1282 'python_arch%': 'ia32',
1283 'icu_use_data_file_flag%': 1,
1283 }], 1284 }],
1284 ['os_posix==1 and OS!="mac" and OS!="ios"', { 1285 ['os_posix==1 and OS!="mac" and OS!="ios"', {
1285 # Figure out the python architecture to decide if we build pyauto. 1286 # Figure out the python architecture to decide if we build pyauto.
1286 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)', 1287 'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/< (system_libdir)/libpython<(python_ver).so.1.0)',
1287 'conditions': [ 1288 'conditions': [
1288 ['target_arch=="mipsel"', { 1289 ['target_arch=="mipsel"', {
1289 'werror%': '', 1290 'werror%': '',
1290 'disable_nacl%': 1, 1291 'disable_nacl%': 1,
1291 'nacl_untrusted_build%': 0, 1292 'nacl_untrusted_build%': 0,
1292 'linux_use_tcmalloc%': 0, 1293 'linux_use_tcmalloc%': 0,
(...skipping 3503 matching lines...) Expand 10 before | Expand all | Expand 10 after
4796 # settings in target dicts. SYMROOT is a special case, because many other 4797 # settings in target dicts. SYMROOT is a special case, because many other
4797 # Xcode variables depend on it, including variables such as 4798 # Xcode variables depend on it, including variables such as
4798 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4799 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4799 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4800 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4800 # files to appear (when present) in the UI as actual files and not red 4801 # files to appear (when present) in the UI as actual files and not red
4801 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4802 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4802 # and therefore SYMROOT, needs to be set at the project level. 4803 # and therefore SYMROOT, needs to be set at the project level.
4803 'SYMROOT': '<(DEPTH)/xcodebuild', 4804 'SYMROOT': '<(DEPTH)/xcodebuild',
4804 }, 4805 },
4805 } 4806 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698