From patchwork Fri Feb 1 23:06:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gall X-Patchwork-Id: 14414 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 15DC223F8B for ; Fri, 1 Feb 2013 23:07:02 +0000 (UTC) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by fiordland.canonical.com (Postfix) with ESMTP id 99F8DA19414 for ; Fri, 1 Feb 2013 23:07:01 +0000 (UTC) Received: by mail-ve0-f177.google.com with SMTP id m1so3363087ves.22 for ; Fri, 01 Feb 2013 15:07:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=GNxNmKJG6UeyVe6QxxaWN7zspy3FxJdG4eIQgVLMlvw=; b=jK/ilSnHIxym9xOWAbTgNrfJh+hKF5MkhyJ24Mg0ZTtL3g1KTtX3kTxf9y65Sy6yaH xbUnDDxcaPn7R8CKOLVJmw4xwCdgW27QV41LVyPWVJHW/rZiK0b52BXkREOmpgtrshWt 8k0lCTct6WSp7h891vxD5YWL3wVP+q0OdD/xlMyvX/kv+TCEMmmZKMULiICrIn4D9etI n1B7ol0KgvThy+Qqe9xgE0H/r16G24XXoR3rnMxku/QVtnM3Qeswq9YZBoOpwckO7EPt 4Fp4axoL6KONOGEDoJEdarm/VqKwf1xjsE10n4P7jDjnedN51feX164s5XZpXeGGva5l yPLg== X-Received: by 10.59.7.65 with SMTP id da1mr8635961ved.4.1359760020899; Fri, 01 Feb 2013 15:07:00 -0800 (PST) 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.58.252.8 with SMTP id zo8csp140897vec; Fri, 1 Feb 2013 15:07:00 -0800 (PST) X-Received: by 10.50.17.201 with SMTP id q9mr195538igd.107.1359760020166; Fri, 01 Feb 2013 15:07:00 -0800 (PST) Received: from mail-ia0-x231.google.com (ia-in-x0231.1e100.net [2607:f8b0:4001:c02::231]) by mx.google.com with ESMTPS id j2si2979835igq.67.2013.02.01.15.06.59 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 15:07:00 -0800 (PST) Received-SPF: neutral (google.com: 2607:f8b0:4001:c02::231 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) client-ip=2607:f8b0:4001:c02::231; Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:4001:c02::231 is neither permitted nor denied by best guess record for domain of tom.gall@linaro.org) smtp.mail=tom.gall@linaro.org Received: by mail-ia0-f177.google.com with SMTP id h8so6036300iaa.22 for ; Fri, 01 Feb 2013 15:06:59 -0800 (PST) X-Received: by 10.43.90.198 with SMTP id bj6mr10743546icc.11.1359760019801; Fri, 01 Feb 2013 15:06:59 -0800 (PST) Received: from mars.mantorvilleexpress.com ([70.35.96.184]) by mx.google.com with ESMTPS id px5sm4909818igc.0.2013.02.01.15.06.57 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Feb 2013 15:06:58 -0800 (PST) From: Tom Gall To: piglit@lists.freedesktop.org Cc: patches@linaro.org, Tom Gall Subject: [PATCH 4/7] Android: Build libpiglitutil_gles2 in Android.mk Date: Fri, 1 Feb 2013 17:06:36 -0600 Message-Id: <1359759999-31064-4-git-send-email-tom.gall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1359759999-31064-1-git-send-email-tom.gall@linaro.org> References: <1359759999-31064-1-git-send-email-tom.gall@linaro.org> X-Gm-Message-State: ALoCoQn7TMv5bnjBIzKZZhU3y+084YHVXizLsnenIci9NmK3iny1g4TcVJ1t1plJKs4B1dd6nk2A Adds Android.mk to build libpiglitutil_gles2 as well as autogenerate config.h, and generated_dispatch.ch Signed-off-by: Tom Gall --- tests/util/Android.mk | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 tests/util/Android.mk diff --git a/tests/util/Android.mk b/tests/util/Android.mk new file mode 100644 index 0000000..488325a --- /dev/null +++ b/tests/util/Android.mk @@ -0,0 +1,98 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +# piglit_top := $(LOCAL_PATH)/../.. + +piglit_major_version := 1 +piglit_minor_version := 0 +piglit_patch_version := 0 + +LOCAL_MODULE := libpiglitutil_gles2 +LOCAL_MODULE_TAG := eng + +LOCAL_CFLAGS := -DPIGLIT_USE_WAFFLE \ + -DPIGLIT_USE_OPENGL_ES2 \ + -DPIGLIT_HAS_ANDROID \ + -DSOURCE_DIR='"piglit";' \ + +LOCAL_C_INCLUDES := . \ + external/stlport/stlport \ + bionic \ + $(piglit_top)/src \ + $(piglit_top)/tests/util \ + external/waffle/include/waffle \ + +$(pigit_top)/tests/util/generated_dispatch.h: \ + $(piglit_top)/Android.mk \ + $(LOCAL_PATH)/config.h.in + @echo "target Generated dispatch tables" + python $(piglit_top)/glapi/parse_glspec.py $(piglit_top)/glapi/gl.tm $(piglit_top)/glapi/gl.spec $(piglit_top)/glapi/enumext.spec $(piglit_top)/glapi/glapi.json + python $(LOCAL_PATH)/gen_dispatch.py $(piglit_top)/glapi/glapi.json $(LOCAL_PATH)/generated_dispatch.c $(LOCAL_PATH)/generated_dispatch.h + @sed -e 's/#cmakedefine HAVE_STRCHRNUL/#define HAVE_STRCHRNUL/' \ + -e 's/#cmakedefine HAVE_FOPEN_S//' \ + -e 's/#cmakedefine HAVE_SETRLIMIT/#define HAVE_SETRLIMIT/' \ + -e 's/#cmakedefine HAVE_FCNTL_H/#define HAVE_FCNTL_H/' \ + -e 's/#cmakedefine HAVE_SYS_STAT_H/#define HAVE_SYS_STAT_H/' \ + -e 's/#cmakedefine HAVE_SYS_TYPES_H/#define HAVE_SYS_TYPES_H/' \ + -e 's/#cmakedefine HAVE_SYS_TIME_H/#define HAVE_TIME_H/' \ + -e 's/#cmakedefine HAVE_SYS_RESOURCE_H/#define HAVE_SYS_RESOURCE_H/' \ + -e 's/#cmakedefine HAVE_UNISTD_H/#define HAVE_UNISTD_H/' \ + $(LOCAL_PATH)/config.h.in \ + > $(LOCAL_PATH)/config.h + +LOCAL_SRC_FILES := \ + piglit-vbo.cpp \ + piglit-shader.c \ + piglit-shader-gles2.c \ + piglit-util-gl-enum.c \ + piglit-util-gles.c \ + minmax-test.c \ + piglit-util.c \ + fdo-bitmap.c \ + piglit-util-gl-common.c \ + piglit-framework-gl/piglit_gl_framework.c \ + piglit-framework-gl.c \ + piglit_ktx.c \ + rgb9e5.c \ + piglit-framework-gl/piglit_android_framework.c \ + piglit-framework-gl/piglit_gbm_framework.c \ + piglit-framework-gl/piglit_fbo_framework.c \ + piglit-framework-gl/piglit_wfl_framework.c \ + piglit-framework-gl/piglit_winsys_framework.c \ + piglit-framework-gl/piglit_wl_framework.c \ + piglit-util-waffle.c \ + +LOCAL_SHARED_LIBRARIES := \ + libGLESv2 \ + libwaffle-1 \ + libstdc++ \ + libstlport \ + +LOCAL_COPY_HEADERS := \ + glxew.h \ + piglit-framework-gl.h \ + piglit-util-egl.h \ + minmax-test.h \ + piglit-glx-util.h \ + piglit-util-gl-common.h \ + piglit-dispatch.h \ + piglit_ktx.h \ + piglit-util.h \ + piglit-framework-cl-api.h \ + piglit-shader.h \ + piglit-util-waffle.h \ + piglit-framework-cl-custom.h \ + piglit-util-cl-enum.h \ + piglit-vbo.h \ + piglit-framework-cl.h \ + piglit-util-cl.h \ + rgb9e5.h \ + piglit-framework-cl-program.h \ + piglit-util-compressed-grays.h \ + sized-internalformats.h \ + generated_dispatch.h \ + +LOCAL_COPY_HEADERS_TO := piglit-$(piglit_major_version) + +include $(BUILD_SHARED_LIBRARY)