From patchwork Thu Jan 29 15:27:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 5743511 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6D4579F36E for ; Thu, 29 Jan 2015 15:28:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A055420117 for ; Thu, 29 Jan 2015 15:28:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D31FE2024F for ; Thu, 29 Jan 2015 15:28:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1C8B17A006; Thu, 29 Jan 2015 07:28:09 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by gabe.freedesktop.org (Postfix) with ESMTP id D0A507A006 for ; Thu, 29 Jan 2015 07:28:07 -0800 (PST) Received: by mail-wg0-f51.google.com with SMTP id k14so23394641wgh.10 for ; Thu, 29 Jan 2015 07:28:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=89tMkvE2HMCBL7Q//xT38sxIvWAxDxbESiAiVB6ksoA=; b=0Tu7JEylIvNeEX6wj8ql1ND0p4a9013Q9NPIpxzoVlN/rn54kOk8B71fq1DskNwcci XDomCxer/+qmY4AVsqM0OyJQea30+fulWUMcmYreMuDJUSCNWadkZohphmbZOH0RV5v4 l1NzHGS/ezapHnvjGLncIcykoI9drGOHdDvyw0qiSq8aUwb+qxMVLSxFJWCtnuGfgS3k Ba9uXxTCywjiujp+g4j02GzsA263+sh8jwfWUYGbqZTkHXChwtXuC9Jo6vDRGp8eYQI1 nhsEp7b0B1JaBZjj6xkTI41UgixLLsWpF+c1dEs6W0fKWr108sa8ZeAT/QMHkWB5QPVC PITA== X-Received: by 10.194.20.67 with SMTP id l3mr2294890wje.94.1422545287272; Thu, 29 Jan 2015 07:28:07 -0800 (PST) Received: from arch-laptop.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by mx.google.com with ESMTPSA id dj4sm10898406wjc.13.2015.01.29.07.28.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Jan 2015 07:28:06 -0800 (PST) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH 04.2/11] SQUASH: util: add android build Date: Thu, 29 Jan 2015 15:27:47 +0000 Message-Id: <1422545267-2911-1-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1422029304-1926-5-git-send-email-thierry.reding@gmail.com> References: <1422029304-1926-5-git-send-email-thierry.reding@gmail.com> Cc: emil.l.velikov@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 Signed-off-by: Emil Velikov --- Android.mk | 1 + CleanSpec.mk | 1 + tests/modetest/Android.mk | 5 ++++- tests/util/Android.mk | 13 +++++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 tests/util/Android.mk diff --git a/Android.mk b/Android.mk index 6f76113..af5f7a9 100644 --- a/Android.mk +++ b/Android.mk @@ -57,6 +57,7 @@ SUBDIRS := \ nouveau \ radeon \ libkms \ + tests/util \ tests/modetest mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS)) diff --git a/CleanSpec.mk b/CleanSpec.mk index 8e23cd2..28a11db 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -1,3 +1,4 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/include/libdrm) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/include/freedreno) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libdrm_*intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libdrm_*intermediates) diff --git a/tests/modetest/Android.mk b/tests/modetest/Android.mk index aee3564..6cf10dc 100644 --- a/tests/modetest/Android.mk +++ b/tests/modetest/Android.mk @@ -7,8 +7,11 @@ LOCAL_SRC_FILES := $(MODETEST_FILES) LOCAL_MODULE := modetest -LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm +LOCAL_C_INCLUDES += \ + $(TARGET_OUT_HEADERS)/libdrm \ + $(LIBDRM_TOP)/tests LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_STATIC_LIBRARIES := libdrm_util include $(BUILD_EXECUTABLE) diff --git a/tests/util/Android.mk b/tests/util/Android.mk new file mode 100644 index 0000000..4dc1cce --- /dev/null +++ b/tests/util/Android.mk @@ -0,0 +1,13 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +include $(LOCAL_PATH)/Makefile.sources + +LOCAL_SRC_FILES := $(UTIL_FILES) + +LOCAL_MODULE := libdrm_util + +LOCAL_C_INCLUDES += \ + $(TARGET_OUT_HEADERS)/libdrm + +include $(BUILD_STATIC_LIBRARY)