From patchwork Tue Jul 29 17:27:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 4641661 Return-Path: X-Original-To: patchwork-dri-devel@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 20CC9C033A for ; Tue, 29 Jul 2014 17:28:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7F0812018B for ; Tue, 29 Jul 2014 17:28:30 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0A9C920142 for ; Tue, 29 Jul 2014 17:28:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DD8A86E4AE; Tue, 29 Jul 2014 10:28:27 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by gabe.freedesktop.org (Postfix) with ESMTP id AE94E6E49F for ; Tue, 29 Jul 2014 10:28:24 -0700 (PDT) Received: by mail-wi0-f176.google.com with SMTP id bs8so6107860wib.15 for ; Tue, 29 Jul 2014 10:28:22 -0700 (PDT) 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=vg9HEojCoBkQwanMmmMxQg8RCmoswLYlYDC3nbx0hAI=; b=dUVb+lvWbZjvGkQZSQbQyVraXBF809yWJocxL122r7wyQQAal9A31JLMbF/VaO5QqF QCcqnd5xc2HlwAYqqA+H2yBa1hO2t/RFzEVhulO+idWSRkgSeZFBjaRZZUy2HiU4Agfa LP/8I/rCi+jyoIY1KZj2pXWzJBa3IgouYdpuuATR5d1VT4lKCYvdqltQ2NzjN68cdZHK iKb8QUQaDwcrNHfHA70/cEfNJQ6InAxUkBw0prQOC+UxaiVACKRVtwKcSRrbJrEbR4Dv 46WCuMkyhVM08xkDdrgn9L/ZP+NfhgZuqeSGjgXQBbRqB/u0VCVLuQq2lWLJj9HhyOw/ fnfw== X-Received: by 10.180.211.101 with SMTP id nb5mr43693397wic.53.1406654901999; Tue, 29 Jul 2014 10:28:21 -0700 (PDT) Received: from localhost.localdomain (cpc20-stap10-2-0-cust563.12-2.cable.virginm.net. [82.20.130.52]) by mx.google.com with ESMTPSA id dc3sm1850278wib.9.2014.07.29.10.28.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jul 2014 10:28:21 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH 7/8] nouveau: add Android build support Date: Tue, 29 Jul 2014 18:27:22 +0100 Message-Id: <1406654843-13625-8-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.0.2 In-Reply-To: <1406654843-13625-1-git-send-email-emil.l.velikov@gmail.com> References: <1406485557-10638-1-git-send-email-emil.l.velikov@gmail.com> <1406654843-13625-1-git-send-email-emil.l.velikov@gmail.com> Cc: Emil Velikov X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 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.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 v2 Rename the headers variable(s) to *_H_FILES. Signed-off-by: Emil Velikov --- Android.mk | 1 + nouveau/Android.mk | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 nouveau/Android.mk diff --git a/Android.mk b/Android.mk index 3f43625..d040d4f 100644 --- a/Android.mk +++ b/Android.mk @@ -55,6 +55,7 @@ include $(BUILD_SHARED_LIBRARY) SUBDIRS := \ intel \ + nouveau \ radeon mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS)) diff --git a/nouveau/Android.mk b/nouveau/Android.mk new file mode 100644 index 0000000..734fc21 --- /dev/null +++ b/nouveau/Android.mk @@ -0,0 +1,30 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +# Import variables LIBDRM_NOUVEAU_FILES, LIBDRM_NOUVEAU_H_FILES +include $(LOCAL_PATH)/Makefile.sources + +LOCAL_MODULE := libdrm_nouveau +LOCAL_MODULE_TAGS := optional + +LOCAL_SHARED_LIBRARIES := libdrm + +LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) +LOCAL_EXPORT_C_INCLUDE_DIRS += \ + $(LOCAL_PATH)/nouveau + +LOCAL_C_INCLUDES := \ + $(LIBDRM_TOP) \ + $(LIBDRM_TOP)/nouveau \ + $(LIBDRM_TOP)/include/drm + +LOCAL_CFLAGS := \ + -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 + +LOCAL_COPY_HEADERS := $(LIBDRM_NOUVEAU_H_FILES) +LOCAL_COPY_HEADERS_TO := libdrm + +LOCAL_SHARED_LIBRARIES := \ + libdrm + +include $(BUILD_SHARED_LIBRARY)