[Branch,~glmark2-dev/glmark2/trunk] Rev 204: Android: Don't treat unus...

My dashboard
Submitter alexandros.frantzis@linaro.org
Subject [Branch,~glmark2-dev/glmark2/trunk] Rev 204: Android: Don't treat unused parameters as an error.
Date April 11, 2012, 3:33 p.m.
List thread <20120411153310.21726.4344.launchpad@ackee.canonical.com>
Project glmark2
State Accepted
Last updated April 11, 2012, 3:33 p.m.
Headers show

Comments

noreply@launchpad.net - April 11, 2012, 3:33 p.m.
------------------------------------------------------------
revno: 204
committer: Alexandros Frantzis <alexandros.frantzis@linaro.org>
branch nick: trunk
timestamp: Tue 2012-04-03 11:38:00 +0300
message:
  Android: Don't treat unused parameters as an error.
  
  The AOSP ships some header files which contain functions with unused parameters.
  Because we have strict compilation flags, the unused parameters break the build.
  To work around this issue, this commit stops treating unused parameters as an
  error, at least until the AOSP code is fixed upstream.
modified:
  android/jni/Android.mk


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription

Patch

=== modified file 'android/jni/Android.mk'
--- android/jni/Android.mk	2012-03-22 10:37:35 +0000
+++ android/jni/Android.mk	2012-04-03 08:38:00 +0000
@@ -4,7 +4,8 @@ 
 
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_MODULE := libglmark2-matrix
-LOCAL_CFLAGS := -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
+LOCAL_CFLAGS := -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
+                -Wno-error=unused-parameter
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src
 LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/libmatrix/*.cc))
 LOCAL_SHARED_LIBRARIES := libdl libstlport
@@ -27,7 +28,8 @@ 
 LOCAL_MODULE := libglmark2-android
 LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png
 LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.03\"" \
-                -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor
+                -DUSE_GLESv2 -Werror -Wall -Wextra -Wnon-virtual-dtor \
+                -Wno-error=unused-parameter
 LOCAL_SHARED_LIBRARIES := liblog libz libEGL libGLESv2 libandroid libdl libstlport
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
                     $(LOCAL_PATH)/src/libmatrix \