diff options
Diffstat (limited to 'chromium/build/common.gypi')
| -rw-r--r-- | chromium/build/common.gypi | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/chromium/build/common.gypi b/chromium/build/common.gypi index 4bb835a0235..16e8a729e5e 100644 --- a/chromium/build/common.gypi +++ b/chromium/build/common.gypi @@ -523,7 +523,6 @@ 'enable_automation%': 0, 'enable_extensions%': 0, 'enable_google_now%': 0, - 'enable_printing%': 0, 'enable_spellcheck%': 0, 'enable_themes%': 0, 'proprietary_codecs%': 1, @@ -534,6 +533,15 @@ 'native_memory_pressure_signals%': 1, }], + # Enable basic printing for Chrome for Android but disable printing + # completely for WebView. + ['OS=="android" and android_webview_build==0', { + 'enable_printing%': 2, + }], + ['OS=="android" and android_webview_build==1', { + 'enable_printing%': 0, + }], + # Enable autofill dialog for Android, Mac and Views-enabled platforms. ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS=="mac"', { 'enable_autofill_dialog%': 1 @@ -2822,14 +2830,6 @@ '-Wl,--warn-shared-textrel', ], }], - ['OS=="android" and android_webview_build==1', { - 'ldflags!': [ - # Must not turn on --fatal-warnings or warn-shared-textrel, - # see crbug.com/157326. - '-Wl,--fatal-warnings', - '-Wl,--warn-shared-textrel', - ], - }], ['OS=="android" and android_full_debug==0', { # Some configurations are copied from Release_Base to reduce # the binary size. @@ -2903,14 +2903,6 @@ '-Wl,--warn-shared-textrel', ], }], - ['OS=="android" and android_webview_build==1', { - 'ldflags!': [ - # Must not turn on --fatal-warnings or - # shared-text-rel, see crbug.com/157326. - '-Wl,--fatal-warnings', - '-Wl,--warn-shared-textrel', - ], - }], ['clang==1', { 'cflags!': [ '-fno-ident', @@ -3003,6 +2995,7 @@ ['chromeos==1 and disable_sse2==0', { 'cflags': [ '-msse2', + '-mfpmath=sse', ], }], # Use gold linker for Android ia32 target. @@ -3813,6 +3806,8 @@ '-Wl,--gc-sections', '-Wl,-O1', '-Wl,--as-needed', + '-Wl,--warn-shared-textrel', + '-Wl,--fatal-warnings', ], }], # Settings for building host targets on mac. |