From patchwork Mon May 21 14:00:19 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: 8841 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 49FD723E49 for ; Mon, 21 May 2012 14:00:54 +0000 (UTC) Received: from mail-qa0-f45.google.com (mail-qa0-f45.google.com [209.85.216.45]) by fiordland.canonical.com (Postfix) with ESMTP id C8BE8A18B61 for ; Mon, 21 May 2012 14:00:53 +0000 (UTC) Received: by qaeb19 with SMTP id b19so1745615qae.11 for ; Mon, 21 May 2012 07:00:53 -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=RGeQc8QIhwlvsOA+o5PqsRITIDlirvIpJXit9tov91E=; b=U6h+KjJquwNbyRfJRZbz1WrrIZ1i/mjL3aTGdK19qsYfqqR0WbXllQ4X/sf45MnuX1 O0ry1/jy/8/1744ffixkIzZWT/pmRsj06ndAvKJWPStBhBEaET12qeGZ5DSbJ8U3IkmZ y9MhaAJu0m+n34pqm8AqfhwmctEIZKzhrI18LiOq5NqJuRd1Uv6pqI2Omoo6D8RqDksi iNw3kUQ2RwiDKJTjAzeHNZe4285URE4kHLvXpZx+CSOfCp9kcWGkZucA81CQeC1vFv5M HFtqD+EzV8GQrrmechaNJ35yrTqudLSmSZyc6fWqFDPTED7pd5+TvDNWdYCrlcKO9zs2 18rw== Received: by 10.50.154.169 with SMTP id vp9mr6622301igb.53.1337608852995; Mon, 21 May 2012 07:00:52 -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.35.72 with SMTP id o8csp293472ibd; Mon, 21 May 2012 07:00:52 -0700 (PDT) Received: by 10.180.99.195 with SMTP id es3mr25727668wib.12.1337608849512; Mon, 21 May 2012 07:00:49 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id s62si142422weh.132.2012.05.21.07.00.19 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 21 May 2012 07:00:49 -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 1SWT9n-0006iN-6f for ; Mon, 21 May 2012 14:00:19 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 2841EE03F1 for ; Mon, 21 May 2012 14:00:19 +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: 211 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~glmark2-dev/glmark2/trunk] Rev 211: Android: Update the in-tree Android makefile to support SceneIdeas. Message-Id: <20120521140019.21271.2780.launchpad@ackee.canonical.com> Date: Mon, 21 May 2012 14:00:19 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15275"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 12ee195f7d106ade8b73770afd2f7f17034f0eb1 X-Gm-Message-State: ALoCoQk2Z/KAG8oGfegPQ8adT54Kwkdc2R4LjJwUFA/5wWd8Eo8OOslp3xe/bALispQriuoP2jmp ------------------------------------------------------------ revno: 211 committer: Alexandros Frantzis branch nick: trunk timestamp: Mon 2012-05-21 16:56:42 +0300 message: Android: Update the in-tree Android makefile to support SceneIdeas. 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-04-03 08:38:00 +0000 +++ android/jni/Android.mk 2012-05-21 13:56:42 +0000 @@ -24,15 +24,31 @@ include $(CLEAR_VARS) +LOCAL_CPP_EXTENSION := .cc +LOCAL_MODULE := libglmark2-ideas +LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DUSE_GLESv2 -Werror -Wall -Wextra\ + -Wnon-virtual-dtor -Wno-error=unused-parameter +LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \ + $(LOCAL_PATH)/src/libmatrix +LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/src/scene-ideas/*.cc)) +LOCAL_SHARED_LIBRARIES := libdl libstlport + +include external/stlport/libstlport.mk + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libglmark2-android -LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png +LOCAL_STATIC_LIBRARIES := libglmark2-matrix libglmark2-png libglmark2-ideas LOCAL_CFLAGS := -DGLMARK_DATA_PATH="" -DGLMARK_VERSION="\"2012.03\"" \ -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 \ + $(LOCAL_PATH)/src/scene-ideas \ $(LOCAL_PATH)/src/libpng \ external/zlib LOCAL_SRC_FILES := $(filter-out src/canvas% src/main.cpp, \