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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index d1c498a5d61ef91446502594532aed338f120872..eb86b3e3f71a3e7c60e1f2c8006c9dafa4776112 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1314,12 +1314,15 @@
'gcc_version%': 46,
}],
],
+ 'binutils_version%': 222,
}, {
'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
+ 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py assembler)',
}],
],
}, {
'gcc_version%': 0,
+ 'binutils_version%': 0,
}],
['OS=="win" and "<!(python <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', {
'windows_sdk_path%': '<(windows_sdk_default_path)',
@@ -1358,20 +1361,7 @@
# can use breakpad for these builds.
'release_unwind_tables%': 0,
}],
- ['OS=="android"', {
- 'conditions': [
- ['target_arch=="x64"', {
- 'binutils_version%': 223,
- }, {
- 'binutils_version%': 222,
- }],
- ],
- }, {
- 'binutils_version%': '<!(python <(DEPTH)/build/compiler_version.py assembler)',
- }],
- ],
- }, {
- 'binutils_version%': 0,
+ ],
}], # os_posix==1 and OS!="mac" and OS!="ios"
['OS=="ios"', {
'disable_nacl%': 1,
« 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