From patchwork Wed Apr 11 15:33:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alexandros.frantzis@linaro.org X-Patchwork-Id: 7737 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4DA0D23E49 for ; Wed, 11 Apr 2012 15:33:14 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id CF207A186FD for ; Wed, 11 Apr 2012 15:33:13 +0000 (UTC) Received: by iage36 with SMTP id e36so1937599iag.11 for ; Wed, 11 Apr 2012 08:33:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=eZo653yLIcczq2wqXfyzke7GJJLy5g8DI8VCzBavrys=; b=d0PCQZyPqEU+4rF4VxJfhlKyp3qVqtfaJeJbE5+DOieYhkP5NzOT9gxK7gcCUROriz ZWDvFoXbqwwLOXBykK4nXaoT249OaHwAYPh4mCAaiArJ0wI/0OAHM0wxE5c/dsXWThdv ogKE2aR6hHbutFpGxlLaks5PkrNw3XmROHtgwruy6rwfnNn2OdsXBI/8Q0q618oYsyaY x52g3nw786EsIU4R3mefVi+RWHqUQrw1ufAQj4MM3dOuT27EVOtE7aS2nShCelxuOhSV n15p+KB935LlbnpGjMvp/iXLp3oyeNL8KGhhe9nOEM0OWb3CWr8kSjN71G/FdDMow5D9 OiLg== Received: by 10.42.203.148 with SMTP id fi20mr9704206icb.10.1334158393227; Wed, 11 Apr 2012 08:33:13 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.164.217 with SMTP id f25csp102526iby; Wed, 11 Apr 2012 08:33:12 -0700 (PDT) Received: by 10.180.80.9 with SMTP id n9mr17338152wix.4.1334158391616; Wed, 11 Apr 2012 08:33:11 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id u63si3012104wec.20.2012.04.11.08.33.11 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Apr 2012 08:33:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1SHzXj-00041e-2D for ; Wed, 11 Apr 2012 15:33:11 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id F28CFE0433 for ; Wed, 11 Apr 2012 15:33:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: glmark2 X-Launchpad-Branch: ~glmark2-dev/glmark2/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 204 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 204: Android: Don't treat unused parameters as an error. Message-Id: <20120411153310.21726.4344.launchpad@ackee.canonical.com> Date: Wed, 11 Apr 2012 15:33:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15070"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 709eb571185a7b96fe5e0266bdd68d0122dd2ca9 X-Gm-Message-State: ALoCoQl7NpvP2muQ/ZVaF40p5Ybjeo0QAlS10DicmLj/KUfTCHY/Gzjs3LES0BzJ42BcEB3DE3vF ------------------------------------------------------------ revno: 204 committer: Alexandros Frantzis 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 === 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 \