From: Emil Velikov <emil.l.velikov@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Subject: [PATCH 5/8] libdrm,intel: rework android header handling
Date: Tue, 29 Jul 2014 18:27:20 +0100 [thread overview]
Message-ID: <1406654843-13625-6-git-send-email-emil.l.velikov@gmail.com> (raw)
In-Reply-To: <1406654843-13625-1-git-send-email-emil.l.velikov@gmail.com>
Contains the following patches squashed in:
commit 99247a5bd724ddcf0f06a5518baad207c53f1e2b
Author: Haitao Huang <haitao.huang@intel.com>
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 <haitao.huang@intel.com>
[chad: Fixed inconsistent indentation.]
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
commit 7d0b528cb69995d7ea4e29b2daa1e3b28a362f42
Author: Emil Velikov <emil.l.velikov@gmail.com>
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 <emil.l.velikov@gmail.com>
commit 361de3ba4cadd5357596d1537bb3f216d281532b
Author: Piotr Luc <piotr.luc@intel.com>
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 <piotr.luc@intel.com>
Reviewed-on: http://android.intel.com:8080/113562
Reviewed-by: cactus <cactus@intel.com>
Reviewed-by: Luc, Piotr <Piotr.Luc@intel.com>
Reviewed-by: Purushothaman, Vijay A <vijay.a.purushothaman@intel.com>
Reviewed-by: Stimson, Dale B <dale.b.stimson@intel.com>
Tested-by: Stimson, Dale B <dale.b.stimson@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
commit 2bf22fcbd4cbb9e7c7764d5eff0bb4e75ab1a005
Author: Emil Velikov <emil.l.velikov@gmail.com>
Date: 27 Jul 2014 18:27:21 +0100
android: Separate libdrm and intel LOCAL_EXPORT_C_INCLUDE_DIRS
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
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
--
2.0.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2014-07-29 17:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-27 18:25 [PATCH 0/8] Upstreaming the Android build and misc fixes Emil Velikov
2014-07-27 18:25 ` [PATCH 1/8] all: include config.h only when available and use its defines Emil Velikov
2014-07-27 18:25 ` [PATCH 2/8] libkms: remove explicit define _FILE_OFFSET_BITS 64 Emil Velikov
2014-07-27 18:25 ` [PATCH 3/8] libdrm, freedreno, intel, nouveau, radeon: add Makefile.sources Emil Velikov
2014-07-27 18:25 ` [PATCH 4/8] libdrm,intel: Add Android build Emil Velikov
2014-07-27 18:25 ` [PATCH 5/8] libdrm,intel: rework android header handling Emil Velikov
2014-07-27 18:25 ` [PATCH 6/8] radeon: add Android build support Emil Velikov
2014-07-27 18:25 ` [PATCH 7/8] nouveau: " Emil Velikov
2014-07-27 18:25 ` [PATCH 8/8] freedreno: " Emil Velikov
2014-07-28 2:48 ` [PATCH 0/8] Upstreaming the Android build and misc fixes Emil Velikov
2014-07-28 7:07 ` Daniel Vetter
2014-07-28 12:01 ` Emil Velikov
2014-07-28 15:22 ` Daniel Vetter
2014-07-29 16:14 ` Gore, Tim
2014-07-29 17:10 ` Emil Velikov
2014-07-29 17:27 ` [PATCHv2 " Emil Velikov
2014-07-29 17:27 ` [PATCH 1/8] all: include config.h only when available and use its defines Emil Velikov
2014-07-29 17:27 ` [PATCH 2/8] libkms: remove explicit define _FILE_OFFSET_BITS 64 Emil Velikov
2014-07-29 17:27 ` [PATCH 3/8] libdrm, freedreno, intel, nouveau, radeon: add Makefile.sources Emil Velikov
2014-08-24 18:28 ` [PATCHv3 " Emil Velikov
2014-07-29 17:27 ` [PATCH 4/8] libdrm,intel: Add Android build Emil Velikov
2014-07-29 17:27 ` Emil Velikov [this message]
2014-07-29 17:27 ` [PATCH 6/8] radeon: add Android build support Emil Velikov
2014-07-29 17:27 ` [PATCH 7/8] nouveau: " Emil Velikov
2014-07-29 17:27 ` [PATCH 8/8] freedreno: " Emil Velikov
2014-07-31 15:33 ` [PATCHv2 0/8] Upstreaming the Android build and misc fixes Gore, Tim
2014-07-31 18:32 ` Emil Velikov
2014-08-24 18:39 ` Emil Velikov
2014-08-29 9:44 ` Gore, Tim
2014-08-29 10:02 ` Emil Velikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406654843-13625-6-git-send-email-emil.l.velikov@gmail.com \
--to=emil.l.velikov@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.