diff options
| author |  djsollen <djsollen@google.com> | 2016-03-07 12:30:47 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-07 12:30:47 -0800 |
| commit | f9deeb66d0941adfade8a24fc3b8217f9473bb1d (patch) | |
| tree | 2d5d9e75507680c80c4d74c0e976d2f09e440311 /gyp | |
| parent | 71aca549914c868d50cd51ddff3fb7a5bfe250cd (diff) | |
Update android_make to support both --gcc and --clang options.
This CL also fixes all the errors that resulted from compiling
with clang and ccache.
BUG=skia:4948
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1774503004
Review URL: https://codereview.chromium.org/1774503004
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/codec.gyp | 2 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 9 | ||||
| -rw-r--r-- | gyp/freetype.gyp | 5 | ||||
| -rw-r--r-- | gyp/lua.gyp | 5 |
4 files changed, 20 insertions, 1 deletions
diff --git a/gyp/codec.gyp b/gyp/codec.gyp index e96aaed9d5..81b28fe5f3 100644 --- a/gyp/codec.gyp +++ b/gyp/codec.gyp @@ -24,7 +24,7 @@ ], 'cflags':[ # FIXME: This gets around a warning: "Argument might be clobbered by longjmp". - '-Wno-clobbered -Wno-error', + '-Wno-clobbered -Wno-error', ], 'include_dirs': [ '../include/codec', diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 2c04ea34a9..bfdbb9e29b 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -656,6 +656,15 @@ [ 'skia_profile_enabled == 1', { 'cflags': ['-g', '-fno-omit-frame-pointer', '-marm', '-mapcs'], }], + [ 'skia_clang_build', { + 'cflags': [ + '-Wno-unknown-warning-option', # Allows unknown warnings + # These flags that are on by default for only the android + # toolchain and no other platforms. + '-Wno-tautological-compare', + '-Wno-unused-command-line-argument', + ], + }], ], }, ], diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp index 94ab94cc3c..f282f77cf7 100644 --- a/gyp/freetype.gyp +++ b/gyp/freetype.gyp @@ -102,6 +102,11 @@ '-O2', ], }], + [ 'skia_clang_build == 1', { + 'cflags':[ + '-Wno-error', + ], + }], ], }, ], diff --git a/gyp/lua.gyp b/gyp/lua.gyp index e030ffe5ed..5b160eb379 100644 --- a/gyp/lua.gyp +++ b/gyp/lua.gyp @@ -67,6 +67,11 @@ ], } ], + [ 'skia_clang_build == 1', { + 'cflags':[ + '-Wno-error', + ], + }], ], }, ], |