diff options
| author | Jesse Hall <jessehall@google.com> | 2013-03-28 13:22:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-28 13:22:34 -0700 |
| commit | c9a4e2f7dc6cc0843d1b029a9860f4786bb6dbd8 (patch) | |
| tree | 6cc052a83db2c41fe3f0843790abe473be1b1154 | |
| parent | 9794f90368550dba8693a30c61c4bea5c4fb2993 (diff) | |
| parent | 4194b3898df867a5c4377de49ddc72ad3e51122b (diff) | |
| download | frameworks_native-c9a4e2f7dc6cc0843d1b029a9860f4786bb6dbd8.zip frameworks_native-c9a4e2f7dc6cc0843d1b029a9860f4786bb6dbd8.tar.gz frameworks_native-c9a4e2f7dc6cc0843d1b029a9860f4786bb6dbd8.tar.bz2 | |
am 4194b389: am 0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
* commit '4194b3898df867a5c4377de49ddc72ad3e51122b':
frameworks/native/opengl: Fix build with gcc 4.8
| -rw-r--r-- | opengl/tests/gl2_jni/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/gl_jni/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/gl_perfapp/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/gldual/Android.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/opengl/tests/gl2_jni/Android.mk b/opengl/tests/gl2_jni/Android.mk index 5d90ff6..25187c9 100644 --- a/opengl/tests/gl2_jni/Android.mk +++ b/opengl/tests/gl2_jni/Android.mk @@ -30,7 +30,7 @@ include $(CLEAR_VARS) # Optional tag would mean it doesn't get installed by default LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter LOCAL_SRC_FILES:= \ gl_code.cpp diff --git a/opengl/tests/gl_jni/Android.mk b/opengl/tests/gl_jni/Android.mk index 3d20e72..80b4bac 100644 --- a/opengl/tests/gl_jni/Android.mk +++ b/opengl/tests/gl_jni/Android.mk @@ -30,7 +30,7 @@ include $(CLEAR_VARS) # Optional tag would mean it doesn't get installed by default LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter LOCAL_SRC_FILES:= \ gl_code.cpp diff --git a/opengl/tests/gl_perfapp/Android.mk b/opengl/tests/gl_perfapp/Android.mk index 65e50e9..45a5516 100644 --- a/opengl/tests/gl_perfapp/Android.mk +++ b/opengl/tests/gl_perfapp/Android.mk @@ -33,7 +33,7 @@ include $(CLEAR_VARS) # Optional tag would mean it doesn't get installed by default LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter LOCAL_SRC_FILES:= \ gl_code.cpp diff --git a/opengl/tests/gldual/Android.mk b/opengl/tests/gldual/Android.mk index b4b378e..42094c8 100644 --- a/opengl/tests/gldual/Android.mk +++ b/opengl/tests/gldual/Android.mk @@ -30,7 +30,7 @@ include $(CLEAR_VARS) # Optional tag would mean it doesn't get installed by default LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -Werror +LOCAL_CFLAGS := -Werror -Wno-error=unused-parameter LOCAL_SRC_FILES:= \ gl_code.cpp |