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

Side by Side Diff: build/common.gypi

Issue 203603009: Revert of Moving binutils version extraction so it works with clang. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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
« 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 1296 matching lines...) Expand 10 before | Expand all | Expand 10 after
1307 'conditions': [ 1307 'conditions': [
1308 ['OS=="android"', { 1308 ['OS=="android"', {
1309 # We directly set the gcc_version since we know what we use. 1309 # We directly set the gcc_version since we know what we use.
1310 'conditions': [ 1310 'conditions': [
1311 ['target_arch=="x64"', { 1311 ['target_arch=="x64"', {
1312 'gcc_version%': 48, 1312 'gcc_version%': 48,
1313 }, { 1313 }, {
1314 'gcc_version%': 46, 1314 'gcc_version%': 46,
1315 }], 1315 }],
1316 ], 1316 ],
1317 'binutils_version%': 222,
1317 }, { 1318 }, {
1318 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', 1319 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
1320 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py a ssembler)',
1319 }], 1321 }],
1320 ], 1322 ],
1321 }, { 1323 }, {
1322 'gcc_version%': 0, 1324 'gcc_version%': 0,
1325 'binutils_version%': 0,
1323 }], 1326 }],
1324 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa ult_path))"=="True"', { 1327 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_defa ult_path))"=="True"', {
1325 'windows_sdk_path%': '<(windows_sdk_default_path)', 1328 'windows_sdk_path%': '<(windows_sdk_default_path)',
1326 }, { 1329 }, {
1327 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0', 1330 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0',
1328 }], 1331 }],
1329 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', { 1332 ['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(directx_sdk_defa ult_path))"=="True"', {
1330 'directx_sdk_path%': '<(directx_sdk_default_path)', 1333 'directx_sdk_path%': '<(directx_sdk_default_path)',
1331 }, { 1334 }, {
1332 'directx_sdk_path%': '$(DXSDK_DIR)', 1335 'directx_sdk_path%': '$(DXSDK_DIR)',
(...skipping 18 matching lines...) Expand all
1351 }], 1354 }],
1352 # All Chrome builds have breakpad symbols, but only process the 1355 # All Chrome builds have breakpad symbols, but only process the
1353 # symbols from official builds. 1356 # symbols from official builds.
1354 ['(branding=="Chrome" and buildtype=="Official")', { 1357 ['(branding=="Chrome" and buildtype=="Official")', {
1355 'linux_dump_symbols%': 1, 1358 'linux_dump_symbols%': 1,
1356 1359
1357 # Omit unwind support in official release builds to save space. We 1360 # Omit unwind support in official release builds to save space. We
1358 # can use breakpad for these builds. 1361 # can use breakpad for these builds.
1359 'release_unwind_tables%': 0, 1362 'release_unwind_tables%': 0,
1360 }], 1363 }],
1361 ['OS=="android"', {
1362 'conditions': [
1363 ['target_arch=="x64"', {
1364 'binutils_version%': 223,
1365 }, {
1366 'binutils_version%': 222,
1367 }],
1368 ],
1369 }, {
1370 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py a ssembler)',
1371 }],
1372 ], 1364 ],
1373 }, {
1374 'binutils_version%': 0,
1375 }], # os_posix==1 and OS!="mac" and OS!="ios" 1365 }], # os_posix==1 and OS!="mac" and OS!="ios"
1376 ['OS=="ios"', { 1366 ['OS=="ios"', {
1377 'disable_nacl%': 1, 1367 'disable_nacl%': 1,
1378 'enable_background%': 0, 1368 'enable_background%': 0,
1379 'icu_use_data_file_flag%': 1, 1369 'icu_use_data_file_flag%': 1,
1380 'input_speech%': 0, 1370 'input_speech%': 0,
1381 'use_system_libxml%': 1, 1371 'use_system_libxml%': 1,
1382 'use_system_sqlite%': 1, 1372 'use_system_sqlite%': 1,
1383 'locales==': [ 1373 'locales==': [
1384 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX', 1374 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX',
(...skipping 3728 matching lines...) Expand 10 before | Expand all | Expand 10 after
5113 # settings in target dicts. SYMROOT is a special case, because many other 5103 # settings in target dicts. SYMROOT is a special case, because many other
5114 # Xcode variables depend on it, including variables such as 5104 # Xcode variables depend on it, including variables such as
5115 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5105 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5116 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5106 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5117 # files to appear (when present) in the UI as actual files and not red 5107 # files to appear (when present) in the UI as actual files and not red
5118 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5108 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5119 # and therefore SYMROOT, needs to be set at the project level. 5109 # and therefore SYMROOT, needs to be set at the project level.
5120 'SYMROOT': '<(DEPTH)/xcodebuild', 5110 'SYMROOT': '<(DEPTH)/xcodebuild',
5121 }, 5111 },
5122 } 5112 }
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