Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 58a1bf24cf67d6a7586e70039e11371f94576819..71f1b062203b6ca921160b4a508ef17a4985fe0b 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -1780,7 +1780,7 @@ |
# the class names, so the JNI generator needs to know this. |
'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt', |
}], |
- ['OS=="linux" and target_arch!="mipsel"', { |
+ ['OS=="linux" and target_arch!="mipsel" and target_arch!="arm"', { |
Mark Seaborn
2014/07/22 22:23:31
Does this affect Chrome OS, or do they set the com
Nico
2014/07/22 22:25:00
I made the chromeos chrome.ebuild explicitly set c
|
# TODO(thakis): This is here to measure perf for a while. |
'clang%': 1, |
}], # OS=="mac" |
@@ -4268,6 +4268,16 @@ |
'-Wl,--disable-new-dtags', |
], |
}], |
+ ['gcc_version>=46 and gcc_version<48 and clang==0', { |
Mark Seaborn
2014/07/22 22:23:31
Can you add some comments here? I can't really te
|
+ 'target_conditions': [ |
+ ['_toolset=="target"', { |
+ 'cflags_cc': [ |
+ '-std=gnu++0x', |
+ '-fpermissive', |
+ ], |
+ }], |
+ ], |
+ }], |
['gcc_version>=48 and clang==0', { |
'target_conditions': [ |
['_toolset=="target"', { |