From patchwork Sun Jul 27 18:25:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 4631801 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 1A788C0338 for ; Mon, 28 Jul 2014 00:50:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5DCEF20125 for ; Mon, 28 Jul 2014 00:50:23 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 83C8720123 for ; Mon, 28 Jul 2014 00:50:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A57376E268; Sun, 27 Jul 2014 17:50:21 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by gabe.freedesktop.org (Postfix) with ESMTP id 60F196E32D for ; Sun, 27 Jul 2014 11:26:53 -0700 (PDT) Received: by mail-wi0-f179.google.com with SMTP id f8so3308772wiw.6 for ; Sun, 27 Jul 2014 11:26:52 -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=YcZn/wQPO/w+jziib7ONclfkllx+g4C4/K6Ww/j1qLY=; b=SF7F+6tsqtIQriI6MfKZ/ZWRRSwWNX22KctSXRsj8tPB/nblTbM4mlEsv80HEPQztq 8UOcKc+ClM61hhz2iiTsvk1fYi+ML7k3AZMQkoOsOam2xe6uYMn7mpKZQvbLfT6mzyUw i/3aLcWTceDGTJ4Y3WJLVxwU+rVRGcaZqTH7oGpVOWs7qD7qCNHRyo2c0T916K3qF2F3 b1L5HwH9XhaaamG2bQ2/TfQe6nW+luoOWxBJaCmN8aHDHDFCW+XQ7XHx+WJdFUciU9EH PCx2KKNJu1lO+o2FIuviCK6im8BNrqT2tKAdrhtq1tqb0001FacAg28NDWqA4Lt3p/wz 9vxA== X-Received: by 10.180.182.161 with SMTP id ef1mr22163358wic.44.1406485612569; Sun, 27 Jul 2014 11:26:52 -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 gq4sm21938827wib.8.2014.07.27.11.26.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 27 Jul 2014 11:26:52 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH 7/8] nouveau: add Android build support Date: Sun, 27 Jul 2014 19:25:56 +0100 Message-Id: <1406485557-10638-8-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.0.2 In-Reply-To: <1406485557-10638-1-git-send-email-emil.l.velikov@gmail.com> References: <1406485557-10638-1-git-send-email-emil.l.velikov@gmail.com> X-Mailman-Approved-At: Sun, 27 Jul 2014 17:50:06 -0700 Cc: emil.l.velikov@gmail.com 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.7 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 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 b3fbb5b..eb54bf7 100644 --- a/Android.mk +++ b/Android.mk @@ -54,4 +54,5 @@ LOCAL_COPY_HEADERS_TO := libdrm include $(BUILD_SHARED_LIBRARY) include $(LOCAL_PATH)/intel/Android.mk +include $(LOCAL_PATH)/nouveau/Android.mk include $(LOCAL_PATH)/radeon/Android.mk diff --git a/nouveau/Android.mk b/nouveau/Android.mk new file mode 100644 index 0000000..28350bd --- /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_HEADERS +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_HEADERS) +LOCAL_COPY_HEADERS_TO := libdrm + +LOCAL_SHARED_LIBRARIES := \ + libdrm + +include $(BUILD_SHARED_LIBRARY)