Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 27de0576926fbd294120aa0a3150399f1db28749..61f11034675e8e6e0304be2dab8a3c9e9791a93e 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -2816,14 +2816,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. |
@@ -2897,14 +2889,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', |
@@ -3808,6 +3792,8 @@ |
'-Wl,--gc-sections', |
'-Wl,-O1', |
'-Wl,--as-needed', |
+ '-Wl,--warn-shared-textrel', |
+ '-Wl,--fatal-warnings', |
], |
}], |
# Settings for building host targets on mac. |