diff mbox

[libdrm,3/5] android: remove ${srcdir} from the includes

Message ID 1426635012-27971-4-git-send-email-emil.l.velikov@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Emil Velikov March 17, 2015, 11:30 p.m. UTC
Already implicitly handled by the compiler.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---
 freedreno/Android.mk | 3 ---
 intel/Android.mk     | 1 -
 nouveau/Android.mk   | 3 ---
 radeon/Android.mk    | 3 ---
 4 files changed, 10 deletions(-)

Comments

Chih-Wei Huang March 18, 2015, 1:49 a.m. UTC | #1
2015?3?18? ??7:30 ? "Emil Velikov" <emil.l.velikov@gmail.com> ???
>
> Already implicitly handled by the compiler.

Actually it's not handled by the compiler, but by the Android build system.
It automatically adds  $(LOCAL_PATH), $(intermediate), ... to the include
paths.

> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
> ---
>  freedreno/Android.mk | 3 ---
>  intel/Android.mk     | 1 -
>  nouveau/Android.mk   | 3 ---
>  radeon/Android.mk    | 3 ---
>  4 files changed, 10 deletions(-)
>
> diff --git a/freedreno/Android.mk b/freedreno/Android.mk
> index d6c19fe..9031d61 100644
> --- a/freedreno/Android.mk
> +++ b/freedreno/Android.mk
> @@ -12,9 +12,6 @@ LOCAL_SHARED_LIBRARIES := libdrm
>  LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES)
>  LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
>
> -LOCAL_C_INCLUDES := \
> -       $(LIBDRM_TOP)/freedreno
> -
>  LOCAL_CFLAGS := \
>         -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
>
> diff --git a/intel/Android.mk b/intel/Android.mk
> index 8a30fb5..7397110 100644
> --- a/intel/Android.mk
> +++ b/intel/Android.mk
> @@ -34,7 +34,6 @@ LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES)
>  LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
>
>  LOCAL_C_INCLUDES := \
> -       $(LIBDRM_TOP)/intel \
>         external/libpciaccess/include
>
>  LOCAL_CFLAGS := \
> diff --git a/nouveau/Android.mk b/nouveau/Android.mk
> index 6c46f6c..5bc325c 100644
> --- a/nouveau/Android.mk
> +++ b/nouveau/Android.mk
> @@ -12,9 +12,6 @@ LOCAL_SHARED_LIBRARIES := libdrm
>  LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES)
>  LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
>
> -LOCAL_C_INCLUDES := \
> -       $(LIBDRM_TOP)/nouveau
> -
>  LOCAL_CFLAGS := \
>         -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
>
> diff --git a/radeon/Android.mk b/radeon/Android.mk
> index d9192b6..f12e631 100644
> --- a/radeon/Android.mk
> +++ b/radeon/Android.mk
> @@ -12,9 +12,6 @@ LOCAL_SHARED_LIBRARIES := libdrm
>  LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES)
>  LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
>
> -LOCAL_C_INCLUDES := \
> -       $(LIBDRM_TOP)/radeon
> -
>  LOCAL_CFLAGS := \
>         -DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
>
> --
> 2.1.3
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
Emil Velikov March 18, 2015, 10:21 a.m. UTC | #2
On 18/03/15 01:49, Chih-Wei Huang wrote:
> 2015?3?18? ??7:30 ? "Emil Velikov" <emil.l.velikov@gmail.com
> <mailto:emil.l.velikov@gmail.com>> ???
>>
>> Already implicitly handled by the compiler.
> 
> Actually it's not handled by the compiler, but by the Android build
> system. It automatically adds  $(LOCAL_PATH), $(intermediate), ... to
> the include paths.
> 
Indeed. Same goes for the Automake build. Unless there are bigger fish
to fry, will update it before pushing.

Thanks for spotting this thinko.
Emil
diff mbox

Patch

diff --git a/freedreno/Android.mk b/freedreno/Android.mk
index d6c19fe..9031d61 100644
--- a/freedreno/Android.mk
+++ b/freedreno/Android.mk
@@ -12,9 +12,6 @@  LOCAL_SHARED_LIBRARIES := libdrm
 LOCAL_SRC_FILES := $(LIBDRM_FREEDRENO_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
-LOCAL_C_INCLUDES := \
-	$(LIBDRM_TOP)/freedreno
-
 LOCAL_CFLAGS := \
 	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 
diff --git a/intel/Android.mk b/intel/Android.mk
index 8a30fb5..7397110 100644
--- a/intel/Android.mk
+++ b/intel/Android.mk
@@ -34,7 +34,6 @@  LOCAL_SRC_FILES := $(LIBDRM_INTEL_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
 LOCAL_C_INCLUDES := \
-	$(LIBDRM_TOP)/intel \
 	external/libpciaccess/include
 
 LOCAL_CFLAGS := \
diff --git a/nouveau/Android.mk b/nouveau/Android.mk
index 6c46f6c..5bc325c 100644
--- a/nouveau/Android.mk
+++ b/nouveau/Android.mk
@@ -12,9 +12,6 @@  LOCAL_SHARED_LIBRARIES := libdrm
 LOCAL_SRC_FILES := $(LIBDRM_NOUVEAU_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
-LOCAL_C_INCLUDES := \
-	$(LIBDRM_TOP)/nouveau
-
 LOCAL_CFLAGS := \
 	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1
 
diff --git a/radeon/Android.mk b/radeon/Android.mk
index d9192b6..f12e631 100644
--- a/radeon/Android.mk
+++ b/radeon/Android.mk
@@ -12,9 +12,6 @@  LOCAL_SHARED_LIBRARIES := libdrm
 LOCAL_SRC_FILES := $(LIBDRM_RADEON_FILES)
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 
-LOCAL_C_INCLUDES := \
-	$(LIBDRM_TOP)/radeon
-
 LOCAL_CFLAGS := \
 	-DHAVE_LIBDRM_ATOMIC_PRIMITIVES=1