[Mesa-dev] [PATCH 2/2] mapi: share sources.mak with Android again

[Chad Versace]

On 07/19/2012 11:00 AM, nobled wrote:
> This (sort of) reverts commit 5154b45217695e5daf24110bcff043fa1959d0a5
>     "mapi: Fix Android build"
> ---
>  src/mapi/Android.mk |   12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/src/mapi/Android.mk b/src/mapi/Android.mk
> index d1749a2..9d54210 100644
> --- a/src/mapi/Android.mk
> +++ b/src/mapi/Android.mk
> @@ -25,6 +25,10 @@
> 
>  LOCAL_PATH := $(call my-dir)
> 
> +# LOCAL_SRC_FILES must only contain relative paths.
> +MAPI := ./mapi
> +include $(LOCAL_PATH)/mapi/sources.mak
> +
>  mapi_abi_headers :=

It's nice to see the return of sharing source lists with Android, but this patch
won't work as-is. In an Android makefile, the current directory '.' is always
the top of the Android source tree, not the directoring containing the makefile.
If I understand the patch's intent correctly, MAPI should be set as
  MAPI := $(LOCAL_PATH)/mapi

-Chad