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

Unified Diff: build/common.gypi

Issue 11419116: Android WebView: fix macro redefinition error. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 bdd49006875f580c53a7266484954d83982bdd67..55f363c4ea5885bd57decc2c550c82b2798e0902 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2993,6 +2993,11 @@
'<(android_src)/frameworks/wilhelm/include',
],
'cflags': [
+ # Android predefines this as 1; undefine it here so Chromium
+ # can redefine it later to be 2 for chromium code and unset
+ # for third party code. This works because cflags are added
+ # before defines.
+ '-U_FORTIFY_SOURCE',
# Chromium builds its own (non-third-party) code with
# -Werror to make all warnings into errors. However, Android
# enables warnings that Chromium doesn't, so some of these
« 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