From patchwork Wed Dec 17 10:44:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tim.gore@intel.com X-Patchwork-Id: 5506651 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7BD2DBEEA8 for ; Wed, 17 Dec 2014 10:44:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A4B05209E3 for ; Wed, 17 Dec 2014 10:44:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E19B5209D5 for ; Wed, 17 Dec 2014 10:44:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 17CBA6E346; Wed, 17 Dec 2014 02:44:39 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id BEB6A6E346 for ; Wed, 17 Dec 2014 02:44:37 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 17 Dec 2014 02:44:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,593,1413270000"; d="scan'208";a="625172340" Received: from tgore-linux.isw.intel.com ([10.102.226.58]) by orsmga001.jf.intel.com with ESMTP; 17 Dec 2014 02:44:12 -0800 From: tim.gore@intel.com To: intel-gfx@lists.freedesktop.org Date: Wed, 17 Dec 2014 10:44:11 +0000 Message-Id: <1418813051-3171-1-git-send-email-tim.gore@intel.com> X-Mailer: git-send-email 2.1.3 Cc: thomas.wood@intel.com Subject: [Intel-gfx] [PATCH i-g-t] Demos/Android.mk: build intel_sprite_on X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tim Gore This reverts the effect of two commits 06fb6c233dd82aac766aa9206644f6eff668ca99 264e1ac10ac14a098a78cc9f96c4e7cabb124ee5 Both of these were to stop demos/intel_sprite_on from being built, but the first was just broken. So this commit re-enables building intel_sprite_on. However, intel_sprite_on will not build in recent Android trees. To overcome this the version of IGT kept in the Android repository will carry a patch to intel_sprite_on, and the automatic build test of IGT on android will patch the freedesktop code on the fly. Signed-off-by: Tim Gore --- demos/Android.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/demos/Android.mk b/demos/Android.mk index 5a00116..7d06c9a 100644 --- a/demos/Android.mk +++ b/demos/Android.mk @@ -23,7 +23,6 @@ LOCAL_STATIC_LIBRARIES := libintel_gpu_tools LOCAL_SHARED_LIBRARIES := libdrm -# This demo (intel_sprite_on.c) wont build on android -#include $(BUILD_EXECUTABLE) +include $(BUILD_EXECUTABLE) #================#