diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-07 18:58:35 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-07 18:58:35 +0000 |
| commit | efbe8e9bedda21a3e061ebf3d96431a0f250a654 (patch) | |
| tree | 4841675c513e4756e18bcba29f16943ff28fec05 /gyp | |
| parent | 365d78762d0878bb3c9d4bfc90c99eab5f2c896a (diff) | |
Fix errors when compiling with -Wall -Werror on Android.
This CL also turns those features on by default on Android
Review URL: https://codereview.appspot.com/7313049
git-svn-id: http://skia.googlecode.com/svn/trunk@7645 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_conditions.gypi | 2 | ||||
| -rw-r--r-- | gyp/jsoncpp.gyp | 6 | ||||
| -rw-r--r-- | gyp/libjpeg.gyp | 2 | ||||
| -rw-r--r-- | gyp/utils.gyp | 8 |
4 files changed, 17 insertions, 1 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index d61cc94169..d1368ddacb 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -311,8 +311,10 @@ '-llog', ], 'cflags': [ + '-Wall', '-fno-exceptions', '-fno-rtti', + '-fstrict-aliasing', '-fuse-ld=gold', ], 'conditions': [ diff --git a/gyp/jsoncpp.gyp b/gyp/jsoncpp.gyp index 1ee33fdb96..07507d4954 100644 --- a/gyp/jsoncpp.gyp +++ b/gyp/jsoncpp.gyp @@ -61,6 +61,12 @@ }, }, }], + [ 'skia_os == "android"', { + 'cflags!': [ + '-Wall', + '-Werror', + ], + }], ], }, ], diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp index 5780b27e44..a9d6aefa0b 100644 --- a/gyp/libjpeg.gyp +++ b/gyp/libjpeg.gyp @@ -89,6 +89,8 @@ ['OS=="android"', { 'cflags!': [ '-fno-rtti', # supresses warnings about invalid option of non-C++ code + '-Wall', + '-Werror', ], }], ], diff --git a/gyp/utils.gyp b/gyp/utils.gyp index c62657de7b..7c445d04b3 100644 --- a/gyp/utils.gyp +++ b/gyp/utils.gyp @@ -199,7 +199,7 @@ }], [ 'skia_os == "android"', { 'sources': [ - '../src/utils/android/ashmem.c', + '../src/utils/android/ashmem.cpp', ], }], ], @@ -242,6 +242,12 @@ }, }, }], + [ 'skia_os == "android"', { + 'cflags!': [ + '-Wall', + '-Werror', + ], + }], ], }, ], |