[PATCH] Fix LIBDRM_PATH for top android build

[PATCH] Fix LIBDRM_PATH for top android build

[joao.santos]

From: Joao Santos <joao.santos@intel.com>

Changed TOP to ANDROID_BUILD_TOP to allow package to be compiled as part
of a top build; LIBDRM_PATH changed to PATH_LIBDRM because otherwise it
cannot be written to when in a top build (must be getting used in some
other makefile).

Issue: VIZ-3495
Signed-off-by: Joao Santos <joao.santos@intel.com>

diff --git a/tests/Android.mk b/tests/Android.mk
index abccb7f..82b28cd 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -2,17 +2,17 @@ include $(LOCAL_PATH)/tests/Makefile.sources
 include $(LOCAL_PATH)/lib/Makefile.sources
 
 LIBPCIACCESS_PATH := $(firstword $(wildcard  \
-   $(TOP)/external/PRIVATE/libpciaccess      \
-   $(TOP)/hardware/intel/libpciaccess        \
-   $(TOP)/external/libpciaccess))
+   $(ANDROID_BUILD_TOP)/external/PRIVATE/libpciaccess      \
+   $(ANDROID_BUILD_TOP)/hardware/intel/libpciaccess        \
+   $(ANDROID_BUILD_TOP)/external/libpciaccess))
 ifeq ($(LIBPCIACCESS_PATH),)
    $(error "Unable to find libpciaccess!")
 endif
 
-LIBDRM_PATH := $(firstword $(wildcard  \
-   $(TOP)/external/PRIVATE/drm         \
-   $(TOP)/external/drm))
-ifeq ($(LIBDRM_PATH),)
+PATH_LIBDRM = $(firstword $(wildcard  \
+   $(ANDROID_BUILD_TOP)/external/PRIVATE/drm         \
+   $(ANDROID_BUILD_TOP)/external/drm))
+ifeq ($(PATH_LIBDRM),)
    $(error "Unable to find libdrm!")
 endif
 
@@ -66,8 +66,8 @@ define add_test
 
     LOCAL_C_INCLUDES +=              \
        $(LOCAL_PATH)/lib             \
-       $(LIBDRM_PATH)/include/drm    \
-       $(LIBDRM_PATH)/intel          \
+       $(PATH_LIBDRM)/include/drm    \
+       $(PATH_LIBDRM)/intel          \
        $(LIBPCIACCESS_PATH)/include
 
     LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
-- 
1.7.9.5

Re: [PATCH] Fix LIBDRM_PATH for top android build

[Damien Lespiau]

Hi,

Can one of you guys review that patch from Joao? You're in a quite
better place than me to do it.

(Note: you don't have to wait until one garbage collects the patches on
the ml, people should find good review candidates if nothing happens for
too long).

Thanks,

-- 
Damien

On Thu, Jan 23, 2014 at 06:29:30PM +0000, joao.santos@intel.com wrote:
> From: Joao Santos <joao.santos@intel.com>
> 
> Changed TOP to ANDROID_BUILD_TOP to allow package to be compiled as part
> of a top build; LIBDRM_PATH changed to PATH_LIBDRM because otherwise it
> cannot be written to when in a top build (must be getting used in some
> other makefile).
> 
> Issue: VIZ-3495
> Signed-off-by: Joao Santos <joao.santos@intel.com>
> 
> diff --git a/tests/Android.mk b/tests/Android.mk
> index abccb7f..82b28cd 100644
> --- a/tests/Android.mk
> +++ b/tests/Android.mk
> @@ -2,17 +2,17 @@ include $(LOCAL_PATH)/tests/Makefile.sources
>  include $(LOCAL_PATH)/lib/Makefile.sources
>  
>  LIBPCIACCESS_PATH := $(firstword $(wildcard  \
> -   $(TOP)/external/PRIVATE/libpciaccess      \
> -   $(TOP)/hardware/intel/libpciaccess        \
> -   $(TOP)/external/libpciaccess))
> +   $(ANDROID_BUILD_TOP)/external/PRIVATE/libpciaccess      \
> +   $(ANDROID_BUILD_TOP)/hardware/intel/libpciaccess        \
> +   $(ANDROID_BUILD_TOP)/external/libpciaccess))
>  ifeq ($(LIBPCIACCESS_PATH),)
>     $(error "Unable to find libpciaccess!")
>  endif
>  
> -LIBDRM_PATH := $(firstword $(wildcard  \
> -   $(TOP)/external/PRIVATE/drm         \
> -   $(TOP)/external/drm))
> -ifeq ($(LIBDRM_PATH),)
> +PATH_LIBDRM = $(firstword $(wildcard  \
> +   $(ANDROID_BUILD_TOP)/external/PRIVATE/drm         \
> +   $(ANDROID_BUILD_TOP)/external/drm))
> +ifeq ($(PATH_LIBDRM),)
>     $(error "Unable to find libdrm!")
>  endif
>  
> @@ -66,8 +66,8 @@ define add_test
>  
>      LOCAL_C_INCLUDES +=              \
>         $(LOCAL_PATH)/lib             \
> -       $(LIBDRM_PATH)/include/drm    \
> -       $(LIBDRM_PATH)/intel          \
> +       $(PATH_LIBDRM)/include/drm    \
> +       $(PATH_LIBDRM)/intel          \
>         $(LIBPCIACCESS_PATH)/include
>  
>      LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] Fix LIBDRM_PATH for top android build

[Mateo Lozano, Oscar]

Reviewed-by: Oscar Mateo <oscar.mateo@intel.com>

(sorry, I forgot about this one)

> -----Original Message-----
> From: intel-gfx-bounces@lists.freedesktop.org [mailto:intel-gfx-
> bounces@lists.freedesktop.org] On Behalf Of joao.santos@intel.com
> Sent: Thursday, January 23, 2014 6:30 PM
> To: intel-gfx@lists.freedesktop.org
> Subject: [Intel-gfx] [PATCH] Fix LIBDRM_PATH for top android build
> 
> From: Joao Santos <joao.santos@intel.com>
> 
> Changed TOP to ANDROID_BUILD_TOP to allow package to be compiled as part
> of a top build; LIBDRM_PATH changed to PATH_LIBDRM because otherwise it
> cannot be written to when in a top build (must be getting used in some other
> makefile).
> 
> Issue: VIZ-3495
> Signed-off-by: Joao Santos <joao.santos@intel.com>
> 
> diff --git a/tests/Android.mk b/tests/Android.mk index abccb7f..82b28cd
> 100644
> --- a/tests/Android.mk
> +++ b/tests/Android.mk
> @@ -2,17 +2,17 @@ include $(LOCAL_PATH)/tests/Makefile.sources
>  include $(LOCAL_PATH)/lib/Makefile.sources
> 
>  LIBPCIACCESS_PATH := $(firstword $(wildcard  \
> -   $(TOP)/external/PRIVATE/libpciaccess      \
> -   $(TOP)/hardware/intel/libpciaccess        \
> -   $(TOP)/external/libpciaccess))
> +   $(ANDROID_BUILD_TOP)/external/PRIVATE/libpciaccess      \
> +   $(ANDROID_BUILD_TOP)/hardware/intel/libpciaccess        \
> +   $(ANDROID_BUILD_TOP)/external/libpciaccess))
>  ifeq ($(LIBPCIACCESS_PATH),)
>     $(error "Unable to find libpciaccess!")  endif
> 
> -LIBDRM_PATH := $(firstword $(wildcard  \
> -   $(TOP)/external/PRIVATE/drm         \
> -   $(TOP)/external/drm))
> -ifeq ($(LIBDRM_PATH),)
> +PATH_LIBDRM = $(firstword $(wildcard  \
> +   $(ANDROID_BUILD_TOP)/external/PRIVATE/drm         \
> +   $(ANDROID_BUILD_TOP)/external/drm))
> +ifeq ($(PATH_LIBDRM),)
>     $(error "Unable to find libdrm!")
>  endif
> 
> @@ -66,8 +66,8 @@ define add_test
> 
>      LOCAL_C_INCLUDES +=              \
>         $(LOCAL_PATH)/lib             \
> -       $(LIBDRM_PATH)/include/drm    \
> -       $(LIBDRM_PATH)/intel          \
> +       $(PATH_LIBDRM)/include/drm    \
> +       $(PATH_LIBDRM)/intel          \
>         $(LIBPCIACCESS_PATH)/include
> 
>      LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
> --
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] Fix LIBDRM_PATH for top android build

[Barbalho, Rafael]

> -----Original Message-----
> From: intel-gfx-bounces@lists.freedesktop.org [mailto:intel-gfx-
> bounces@lists.freedesktop.org] On Behalf Of Mateo Lozano, Oscar
> Sent: Friday, January 31, 2014 9:03 AM
> To: Santos, Joao; intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH] Fix LIBDRM_PATH for top android build
> 
> Reviewed-by: Oscar Mateo <oscar.mateo@intel.com>
> 
> (sorry, I forgot about this one)
> 
> > -----Original Message-----
> > From: intel-gfx-bounces@lists.freedesktop.org [mailto:intel-gfx-
> > bounces@lists.freedesktop.org] On Behalf Of joao.santos@intel.com
> > Sent: Thursday, January 23, 2014 6:30 PM
> > To: intel-gfx@lists.freedesktop.org
> > Subject: [Intel-gfx] [PATCH] Fix LIBDRM_PATH for top android build
> >
> > From: Joao Santos <joao.santos@intel.com>
> >
> > Changed TOP to ANDROID_BUILD_TOP to allow package to be compiled as
> > part of a top build; LIBDRM_PATH changed to PATH_LIBDRM because
> > otherwise it cannot be written to when in a top build (must be getting
> > used in some other makefile).
> >
> > Issue: VIZ-3495
> > Signed-off-by: Joao Santos <joao.santos@intel.com>
> >
> > diff --git a/tests/Android.mk b/tests/Android.mk index
> > abccb7f..82b28cd
> > 100644
> > --- a/tests/Android.mk
> > +++ b/tests/Android.mk
> > @@ -2,17 +2,17 @@ include $(LOCAL_PATH)/tests/Makefile.sources
> >  include $(LOCAL_PATH)/lib/Makefile.sources
> >
> >  LIBPCIACCESS_PATH := $(firstword $(wildcard  \
> > -   $(TOP)/external/PRIVATE/libpciaccess      \
> > -   $(TOP)/hardware/intel/libpciaccess        \
> > -   $(TOP)/external/libpciaccess))
> > +   $(ANDROID_BUILD_TOP)/external/PRIVATE/libpciaccess      \
> > +   $(ANDROID_BUILD_TOP)/hardware/intel/libpciaccess        \
> > +   $(ANDROID_BUILD_TOP)/external/libpciaccess))
> >  ifeq ($(LIBPCIACCESS_PATH),)
> >     $(error "Unable to find libpciaccess!")  endif

The patch is incomplete. If you change these macros in the tests directory then why does it not need to be changed in the tools directory also?

I have a patch that refactors these macros into a third file, I'll send it up for review later once I fix another issue I have in the patch series.

Thanks,
Raf

> >
> > -LIBDRM_PATH := $(firstword $(wildcard  \
> > -   $(TOP)/external/PRIVATE/drm         \
> > -   $(TOP)/external/drm))
> > -ifeq ($(LIBDRM_PATH),)
> > +PATH_LIBDRM = $(firstword $(wildcard  \
> > +   $(ANDROID_BUILD_TOP)/external/PRIVATE/drm         \
> > +   $(ANDROID_BUILD_TOP)/external/drm))
> > +ifeq ($(PATH_LIBDRM),)
> >     $(error "Unable to find libdrm!")
> >  endif
> >
> > @@ -66,8 +66,8 @@ define add_test
> >
> >      LOCAL_C_INCLUDES +=              \
> >         $(LOCAL_PATH)/lib             \
> > -       $(LIBDRM_PATH)/include/drm    \
> > -       $(LIBDRM_PATH)/intel          \
> > +       $(PATH_LIBDRM)/include/drm    \
> > +       $(PATH_LIBDRM)/intel          \
> >         $(LIBPCIACCESS_PATH)/include
> >
> >      LOCAL_CFLAGS += -DHAVE_STRUCT_SYSINFO_TOTALRAM
> > --
> > 1.7.9.5
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] Fix LIBDRM_PATH for top android build

[Damien Lespiau]

On Fri, Jan 31, 2014 at 09:36:25AM +0000, Barbalho, Rafael wrote:
> The patch is incomplete. If you change these macros in the tests
> directory then why does it not need to be changed in the tools
> directory also?
> 
> I have a patch that refactors these macros into a third file, I'll
> send it up for review later once I fix another issue I have in the
> patch series.

Holding the horses then!

-- 
Damien

Re: [PATCH] Fix LIBDRM_PATH for top android build

[Santos, Joao]

Sorry for late reply, I still have trouble keeping track my patches with this email-patching-way-of-doing-things.
 
Yes, that is correct, the tools should also benefit from the same fix.

Joao



-----Original Message-----
From: Lespiau, Damien 
Sent: Friday, January 31, 2014 10:20 AM
To: Barbalho, Rafael
Cc: Mateo Lozano, Oscar; Santos, Joao; intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] Fix LIBDRM_PATH for top android build

On Fri, Jan 31, 2014 at 09:36:25AM +0000, Barbalho, Rafael wrote:
> The patch is incomplete. If you change these macros in the tests 
> directory then why does it not need to be changed in the tools 
> directory also?
> 
> I have a patch that refactors these macros into a third file, I'll 
> send it up for review later once I fix another issue I have in the 
> patch series.

Holding the horses then!

--
Damien