From patchwork Tue Jul 29 17:27:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Emil Velikov X-Patchwork-Id: 4641671 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 32BD59F32F 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 4675C20123 for ; Tue, 29 Jul 2014 17:28:32 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4015C2017D for ; Tue, 29 Jul 2014 17:28:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AA9706E4A8; 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-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by gabe.freedesktop.org (Postfix) with ESMTP id 20C9A6E49F for ; Tue, 29 Jul 2014 10:28:21 -0700 (PDT) Received: by mail-wg0-f52.google.com with SMTP id a1so9326083wgh.35 for ; Tue, 29 Jul 2014 10:28:19 -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 :mime-version:content-type:content-transfer-encoding; bh=LNl/hD+R61FC1uhNQQMraerUShMQV+sFmZncOVBTdJI=; b=Hbvk+5OnKffAZ4eOmykT7OQEMtV8gmWmzW+ZVR1J6AkS3mI6ljYZ5XyHU6GqP1PmBH OnMuv8PPgjDuzgIJtoIzWIAbFTNLza2pAL4uShLHK4hBG0WId7ZM3i4398fxrZvZYQdH 8Jp388cOwd/3eemZDS5iyi4E6OqmEJSAwBv4Jg58s2a9jyFFDW8nlu+CgVIX+CUgWAUy GRuiUsZzGYW8iUMmYYVu3bwjTxIFlkU5IHQ+x6h37ak04iEEfZo/DAUbE9U87W/dOJYo oSj/c/4QvCFl1xf9lOwjsacuS9AoONJxvFjSqK5sCuGsCfoS2EuyAZ2c8jEtT75nIw+d LoLA== X-Received: by 10.194.63.37 with SMTP id d5mr5525913wjs.92.1406654899682; Tue, 29 Jul 2014 10:28:19 -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.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Jul 2014 10:28:18 -0700 (PDT) From: Emil Velikov To: dri-devel@lists.freedesktop.org Subject: [PATCH 5/8] libdrm,intel: rework android header handling Date: Tue, 29 Jul 2014 18:27:20 +0100 Message-Id: <1406654843-13625-6-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> MIME-Version: 1.0 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: , 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 Contains the following patches squashed in: commit 99247a5bd724ddcf0f06a5518baad207c53f1e2b Author: Haitao Huang Date: Fri, 27 Apr 2012 13:20:53 -0500 Android.mk: use LOCAL_COPY_HEADERS to export headers. Export necessary header files used by other components for Android, such as libva intel-driver, gralloc, hwcomposer, etc. Change-Id: I2feabf6941379ef4d756e942f30eba059de641f1 Signed-off-by: Haitao Huang [chad: Fixed inconsistent indentation.] Signed-off-by: Chad Versace commit 7d0b528cb69995d7ea4e29b2daa1e3b28a362f42 Author: Emil Velikov Date: Sun, 27 Jul 2014 18:22:41 +0100 android: reuse headers lists, separate libdrm from intel headers Rather than having a duplicate copy of the headers list(s), reuse the existing one(s). Distinguish that the intel headers should be copied when libdrm_intel is used. v2 Rename the headers variable(s) to *_H_FILES. Signed-off-by: Emil Velikov commit 361de3ba4cadd5357596d1537bb3f216d281532b Author: Piotr Luc Date: Fri, 14 Jun 2013 13:00:39 +0200 Export include dir from libdrm BZ: 116218 Google introduced new method of specifying include path(s) between modules. This allows a module to include header from a library without directly specifyining by includer the path where headers are located. The method requires from library that holds headers to export include path(s) in LOCAL_EXPORT_C_INCLUDE_DIRS variable. These exported include path(s) are automatically added to include path(s) of modules that have name of the library in the LOCAL_SHARED_LIBRARIES or LOCAL_STATIC_LIBRARIES list. This change sets LOCAL_EXPORT_C_INCLUDE_DIRS to folders that contain headers file that used by other modules in order to export these paths. Change-Id: Id1ac885b31ef2efe194e0289fbcaecd9eb533df0 Signed-off-by: Piotr Luc Reviewed-on: http://android.intel.com:8080/113562 Reviewed-by: cactus Reviewed-by: Luc, Piotr Reviewed-by: Purushothaman, Vijay A Reviewed-by: Stimson, Dale B Tested-by: Stimson, Dale B Reviewed-by: buildbot Tested-by: buildbot commit 2bf22fcbd4cbb9e7c7764d5eff0bb4e75ab1a005 Author: Emil Velikov Date: 27 Jul 2014 18:27:21 +0100 android: Separate libdrm and intel LOCAL_EXPORT_C_INCLUDE_DIRS Signed-off-by: Emil Velikov --- Android.mk | 15 +++++++++++++-- intel/Android.mk | 7 ++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index afe59ce..795e554 100644 --- a/Android.mk +++ b/Android.mk @@ -1,5 +1,5 @@ # -# Copyright © 2011 Intel Corporation +# Copyright © 2011-2012 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -26,13 +26,18 @@ include $(CLEAR_VARS) LIBDRM_TOP := $(LOCAL_PATH) -# Import variables LIBDRM_FILES, LIBDRM_HEADERS +# Import variables LIBDRM_FILES, LIBDRM_H_FILES include $(LOCAL_PATH)/Makefile.sources +# Import variables LIBDRM_INCLUDE_H_FILES, LIBDRM_INCLUDE_VMWGFX_H_FILES +include $(LOCAL_PATH)/include/drm/Makefile.sources LOCAL_MODULE := libdrm LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(LIBDRM_FILES) +LOCAL_EXPORT_C_INCLUDE_DIRS += \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/include/drm LOCAL_C_INCLUDES := \ $(LIBDRM_TOP)/include/drm @@ -40,6 +45,12 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 +LOCAL_COPY_HEADERS := \ + $(LIBDRM_H_FILES) \ + $(addprefix include/drm/,$(LIBDRM_INCLUDE_H_FILES)) \ + $(addprefix include/drm/,$(LIBDRM_INCLUDE_VMWGFX_H_FILES)) + +LOCAL_COPY_HEADERS_TO := libdrm include $(BUILD_SHARED_LIBRARY) include $(LOCAL_PATH)/intel/Android.mk diff --git a/intel/Android.mk b/intel/Android.mk index 5c48a95..f2f21b9 100644 --- a/intel/Android.mk +++ b/intel/Android.mk @@ -24,7 +24,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -# Import variables LIBDRM_INTEL_FILES, LIBDRM_INTEL_HEADERS +# Import variables LIBDRM_INTEL_FILES, LIBDRM_INTEL_H_FILES include $(LOCAL_PATH)/Makefile.sources LOCAL_MODULE := libdrm_intel @@ -33,6 +33,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES) +LOCAL_EXPORT_C_INCLUDE_DIRS += \ + $(LOCAL_PATH)/intel LOCAL_C_INCLUDES := \ $(LIBDRM_TOP) \ @@ -43,6 +45,9 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := \ -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1 +LOCAL_COPY_HEADERS := $(LIBDRM_INTEL_H_FILES) +LOCAL_COPY_HEADERS_TO := libdrm + LOCAL_SHARED_LIBRARIES := \ libdrm \ libpciaccess