From patchwork Fri Mar 20 21:11:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 6060951 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 E92EF9F2A9 for ; Fri, 20 Mar 2015 21:08:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35A7C20515 for ; Fri, 20 Mar 2015 21:08:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3A4B720483 for ; Fri, 20 Mar 2015 21:08:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 362366E34F; Fri, 20 Mar 2015 14:08:18 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by gabe.freedesktop.org (Postfix) with ESMTP id D2BC66E34F for ; Fri, 20 Mar 2015 14:08:16 -0700 (PDT) Received: by wixw10 with SMTP id w10so2312730wix.0 for ; Fri, 20 Mar 2015 14:08:16 -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; bh=ISrtTusQZX22QTTnB6YkCRcH5q+/Q+32FFiuWSUNuM4=; b=ctoqOjqK2KnNsAT3bIIsRG3VUIqgGi88N+p9PjhYKiiNpsg4tYp4I3PZDhiP9V1Xjg J80rjvrUNShx/NnNX/foxM578ngXOCY88+U38GqdckE131SyQKcXvvuP0Vg8KscBlcWX HjDG2MwNH5rQY8LIv/pC4YTtaAImuc/Fx54wC/CeslpFwjmNuzvcswO/aKJq0GMxCQci HBWme77TD8mo5wHBZDCxspkZfFljpsXgh9ycNQ4wNrr20F90kdSESoGEMUc05FF/cZY8 1BJT4ym8sgGsuROzxdiBaKI3tmBlzpjDSThOAHQNh3XZOne5cfijJIMRFYzSeb0fNIAo NutA== X-Received: by 10.194.237.34 with SMTP id uz2mr161094576wjc.157.1426885696014; Fri, 20 Mar 2015 14:08:16 -0700 (PDT) Received: from arch-x220.localdomain (cpc12-croy20-2-0-cust52.croy.cable.virginm.net. [82.44.54.53]) by mx.google.com with ESMTPSA id q10sm7894898wjr.41.2015.03.20.14.08.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Mar 2015 14:08:15 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm] android: remove explicit include to libpciaccess Date: Fri, 20 Mar 2015 21:11:28 +0000 Message-Id: <1426885888-963-1-git-send-email-emil.l.velikov@gmail.com> X-Mailer: git-send-email 2.3.1 Cc: Chih-Wei Huang , 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 Both android-x86 and android-ia versions of libpciacccess correctly "export" the include. If anyone else is wrapping up their own version they should do so as well. Remove this fixed location hack from the build. Cc: Chih-Wei Huang Signed-off-by: Emil Velikov --- intel/Android.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/intel/Android.mk b/intel/Android.mk index 0f498ec..6582dfd 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -33,9 +33,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) -LOCAL_C_INCLUDES := \ - external/libpciaccess/include - LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1