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

Unified Diff: build/common.gypi

Issue 12463031: Android WebView: don't specify cpu-specific cflags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase after other CL removed obsolete flag Created 7 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 d851e37f599681364607ff93fedbb96a1e7c655b..e74d0445ec9251340547cb3977b9642de12234dd 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2719,12 +2719,12 @@
'-Wno-abi',
],
'conditions': [
- ['arm_thumb==1', {
+ ['arm_thumb==1 and android_webview_build==0', {
'cflags': [
'-mthumb',
]
}],
- ['armv7==1', {
+ ['armv7==1 and android_webview_build==0', {
'cflags': [
'-march=armv7-a',
'-mtune=cortex-a8',
@@ -2763,10 +2763,10 @@
'-fuse-ld=gold',
],
'conditions': [
- ['arm_thumb==1', {
+ ['arm_thumb==1 and android_webview_build==0', {
'cflags': [ '-mthumb-interwork' ],
}],
- ['armv7==0', {
+ ['armv7==0 and android_webview_build==0', {
# Flags suitable for Android emulator
'cflags': [
'-march=armv5te',
« 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