From patchwork Tue Mar 17 23:30:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 6035431 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 79CBD9F314 for ; Tue, 17 Mar 2015 23:30:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8DC622043C for ; Tue, 17 Mar 2015 23:30:26 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A123F2042B for ; Tue, 17 Mar 2015 23:30:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63DB86E413; Tue, 17 Mar 2015 16:30:24 -0700 (PDT) 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 2DEB58928D for ; Tue, 17 Mar 2015 16:30:21 -0700 (PDT) Received: by wgdm6 with SMTP id m6so21057601wgd.2 for ; Tue, 17 Mar 2015 16:30:20 -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=ZRkPvfJSnEs1k28o7iUp26ztPtTL010EXkKxXuYWA+Y=; b=Jd2uxhnUJe3Z/H/gl1YO5QL7qIIBLe1QVNwAW+mSziTZ2uBlvweg2PUcAkMfNNULo6 HWJ4yGL9KyAuhP7NTlhKMAofU1RMG9siLdmbkp/8beQ37XWbro0Ins0og9M1ThG7MEc4 HCVUiv1VAk7LzEvwbG8b3EpWydL2MeXL0wl9V6Bh9VIDoA11KWKXS7oUx6IF1AW3Msf4 7msglc2MbzNx9thrTIpSas8QsimQUGa/jZ1VRh6jUMAahJt741pzHjzGiF12uJ7BMuxU NRhpbVK/1/R88Y4i/VojOQr5x5rA41sGfcJKgyIRF6BPIQA85M5HnNXaFMR386kXg6lQ BIEw== X-Received: by 10.194.121.136 with SMTP id lk8mr131307801wjb.49.1426635020495; Tue, 17 Mar 2015 16:30:20 -0700 (PDT) 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 hi6sm21937605wjc.34.2015.03.17.16.30.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Mar 2015 16:30:19 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm 1/5] android: correcly set LOCAL_EXPORT_C_INCLUDE_DIRS Date: Tue, 17 Mar 2015 23:30:08 +0000 Message-Id: <1426635012-27971-2-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1426635012-27971-1-git-send-email-emil.l.velikov@gmail.com> References: <1426635012-27971-1-git-send-email-emil.l.velikov@gmail.com> Cc: Emil Velikov , Chih-Wei Huang 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 - Don't add ${hw}/${hw}, but ${hw} to the includes path. The former does not exist. - Set the variable for libkms. Inspired by the work of from Chih-Wei from the Android-x86 project. Signed-off-by: Emil Velikov --- Android.mk | 2 +- freedreno/Android.mk | 3 +-- intel/Android.mk | 3 +-- libkms/Android.mk | 2 ++ nouveau/Android.mk | 3 +-- radeon/Android.mk | 3 +-- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Android.mk b/Android.mk index 6f76113..e6d85d4 100644 --- a/Android.mk +++ b/Android.mk @@ -33,7 +33,7 @@ LOCAL_MODULE := libdrm LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(LIBDRM_FILES) -LOCAL_EXPORT_C_INCLUDE_DIRS += \ +LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(LOCAL_PATH) \ $(LOCAL_PATH)/include/drm diff --git a/freedreno/Android.mk b/freedreno/Android.mk index 22520fb..31b90ef 100644 --- a/freedreno/Android.mk +++ b/freedreno/Android.mk @@ -10,8 +10,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES) -LOCAL_EXPORT_C_INCLUDE_DIRS += \ - $(LOCAL_PATH)/freedreno +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_C_INCLUDES := \ $(LIBDRM_TOP) \ diff --git a/intel/Android.mk b/intel/Android.mk index 202c0d5..2a6bf60 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -31,8 +31,7 @@ LOCAL_MODULE := libdrm_intel LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) -LOCAL_EXPORT_C_INCLUDE_DIRS += \ - $(LOCAL_PATH)/intel +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_C_INCLUDES := \ $(LIBDRM_TOP) \ diff --git a/libkms/Android.mk b/libkms/Android.mk index d2df32a..4d41fbc 100644 --- a/libkms/Android.mk +++ b/libkms/Android.mk @@ -45,6 +45,8 @@ endif LOCAL_MODULE := libkms LOCAL_SHARED_LIBRARIES := libdrm +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) + LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libdrm LOCAL_COPY_HEADERS_TO := libdrm diff --git a/nouveau/Android.mk b/nouveau/Android.mk index 93c9ec2..8e42c40 100644 --- a/nouveau/Android.mk +++ b/nouveau/Android.mk @@ -10,8 +10,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES) -LOCAL_EXPORT_C_INCLUDE_DIRS += \ - $(LOCAL_PATH)/nouveau +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_C_INCLUDES := \ $(LIBDRM_TOP) \ diff --git a/radeon/Android.mk b/radeon/Android.mk index 71c58bd..b4065aa 100644 --- a/radeon/Android.mk +++ b/radeon/Android.mk @@ -10,8 +10,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES) -LOCAL_EXPORT_C_INCLUDE_DIRS += \ - $(LOCAL_PATH)/radeon +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_C_INCLUDES := \ $(LIBDRM_TOP) \