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

Unified Diff: build/common.gypi

Issue 10546152: Determine the version of GCC being used for Android builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed a comment too. Created 8 years, 6 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 68cadbbdbe48eea8fa2c13e9d3c756f6ac1a1a0b..2ed990183b13c4cbe00b0f7f4f22436f5ab343a2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -803,7 +803,7 @@
'wix_exists': '<!(python <(DEPTH)/build/dir_exists.py <(wix_path))',
'conditions': [
- ['os_posix==1 and OS!="mac" and OS!="android"', {
+ ['os_posix==1 and OS!="mac"', {
# This will set gcc_version to XY if you are running gcc X.Y.*.
# This is used to tweak build flags for gcc 4.4.
'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
@@ -819,7 +819,7 @@
'linux_dump_symbols%': 1,
}],
],
- }], # os_posix==1 and OS!="mac" and OS!="android"
+ }],
['OS=="android"', {
# Location of Android NDK.
'variables': {
« 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