[Mesa-dev] [PATCH] mapi: Fix Android build

[Chad Versace]

On 04/09/2012 05:05 PM, Chad Versace wrote:
> The Android build was broken by
>     commit ca760181b4420696c7e86aa2951d7203522ad1e8
>     Author: Kristian Høgsberg <krh at bitplanet.net>
>     Date:   Fri Mar 16 12:55:40 2012 -0400
>     Subject: shared-glapi: Convert to automake
> 
> The guilty change in that commit was changing the variable pattern in
> sources.mak from
>     FOO_FILE := bar.c
> to
>     FOO_FILE := $(TOP)/src/mapi/mapi/bar.c
> 
> Source file paths in Android makefiles must be relative to the makefile.
> To fix this, I reverted the variable pattern back to `FOO_FILE := bar.c`.
> 
> CC: Kristian Høgsberg <krh at bitplanet.net>
> Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
> ---
>  src/mapi/Android.mk               |    2 +-
>  src/mapi/es1api/Makefile          |    4 ++--
>  src/mapi/glapi/Makefile           |    8 ++++----
>  src/mapi/mapi/sources.mak         |   22 +++++++++++-----------
>  src/mapi/shared-glapi/Makefile.am |    3 ++-
>  src/mapi/vgapi/Makefile           |    4 ++--
>  6 files changed, 22 insertions(+), 21 deletions(-)

NAK this patch. After a clean build of Mesa with this patch applied,
dlopen("libGL.so") fails.

----
Chad Versace
chad.versace at linux.intel.com