AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add extra warnings to match what Android uses.

Browse Source 
R=mtklein@google.com

Committed: https://code.google.com/p/skia/source/detail?r=12310

Review URL: https://codereview.chromium.org/74193005

git-svn-id: http://skia.googlecode.com/svn/trunk@12314 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
mtklein@google.com 2013-11-20 15:13:49 +00:00
parent f7159bba8e
commit f1077f9164
6 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gyp/common_conditions.gypi
View File

@ -149,6 +149,22 @@
# The following section is common to linux + derivatives and android
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"]',
{
'cflags': [
'-fno-exceptions',
'-fstrict-aliasing',
'-Wall',
'-Wextra',
'-Winit-self',
'-Wpointer-arith',
'-Wno-unused-parameter',
'-Wno-c++11-extensions',
],
'cflags_cc': [
'-fno-rtti',
'-Wnon-virtual-dtor',
],
'conditions': [
[ 'skia_warnings_as_errors', {
'cflags': [
@ -229,13 +245,6 @@
'defines': [ 'NDEBUG' ],
},
},
'cflags': [
'-Wall',
'-Wextra',
# suppressions below here were added for clang
'-Wno-unused-parameter',
'-Wno-c++11-extensions',
],
'conditions' : [
[ 'skia_shared_lib', {
'cflags': [
@ -474,14 +483,8 @@
'-llog',
],
'cflags': [
'-Wall',
'-fno-exceptions',
'-fstrict-aliasing',
'-fuse-ld=gold',
],
'cflags_cc': [
'-fno-rtti',
],
'conditions': [
[ 'skia_shared_lib', {
'cflags': [

3
gyp/poppler.gyp
View File

@ -129,6 +129,9 @@
'cflags': [
'-w'
],
'cflags_cc!': [
'-fno-rtti'
],
'conditions': [
['skia_os == "linux"', {
'include_dirs': [

13
platform_tools/android/gyp/dependencies.gypi
View File

@ -42,9 +42,7 @@
'../third_party/externals/expat/lib',
],
'cflags': [
'-Wall',
'-Wmissing-prototypes',
'-Wstrict-prototypes',
'-w',
'-fexceptions',
'-DHAVE_EXPAT_CONFIG_H',
],
@ -66,12 +64,9 @@
'../third_party/externals/gif',
],
'cflags': [
'-Wno-format',
'-w',
'-DHAVE_CONFIG_H',
],
'cflags!': [
'-Wall',
],
'direct_dependent_settings': {
'include_dirs': [
'../third_party/externals/gif',
@ -104,11 +99,9 @@
'../third_party/externals/png',
],
'cflags': [
'-w',
'-fvisibility=hidden',
],
'cflags!': [
'-Wall',
],
'link_settings': {
'libraries': [
'-lz',

2
src/animator/SkScriptCallBack.h
View File

@ -13,6 +13,8 @@
class SkScriptCallBack {
public:
virtual ~SkScriptCallBack() { }
enum Type {
kBox,
kFunction,

2
src/core/SkBuffer.h
View File

@ -39,6 +39,8 @@ public:
fStop = (const char*)data + size;
}
virtual ~SkRBuffer() { }
/** Return the number of bytes that have been read from the beginning
of the data pointer.
*/

4
src/gpu/gl/GrGLProgramEffects.h
View File

@ -129,6 +129,8 @@ protected:
*/
class GrGLProgramEffectsBuilder {
public:
virtual ~GrGLProgramEffectsBuilder() { }
/**
* Emits the effect's shader code, and stores the necessary uniforms internally.
*/
@ -211,6 +213,7 @@ private:
class GrGLVertexProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
public:
GrGLVertexProgramEffectsBuilder(GrGLFullShaderBuilder*, int reserveCount);
virtual ~GrGLVertexProgramEffectsBuilder() { }
virtual void emitEffect(const GrEffectStage&,
GrGLProgramEffects::EffectKey,
@ -298,6 +301,7 @@ private:
class GrGLTexGenProgramEffectsBuilder : public GrGLProgramEffectsBuilder {
public:
GrGLTexGenProgramEffectsBuilder(GrGLFragmentOnlyShaderBuilder*, int reserveCount);
virtual ~GrGLTexGenProgramEffectsBuilder() { }
virtual void emitEffect(const GrEffectStage&,
GrGLProgramEffects::EffectKey,