[Mesa-dev] [PATCH v2, android-build] android-build: fix dricore build for autogenerated files

Chad Versace chad.versace at intel.com
Mon Jul 23 13:39:35 PDT 2012

On 07/23/2012 12:13 PM, Daniel Charles wrote:
> Recently more files were removed from control to be auto-generated
> in the dricore library. Android build was not able to locate the
> new files if they were not created beforehand.
> LOCAL_SRC_FILES includes some of those files and Android.gen.mk
> re-defines this variable by filtering out the auto-generated files.
> Unfortunately for this variable it is not the same to have the SRCDIR
> variable defined as the current directory.
> By re-defining SRCDIR for the autotools build the Android build system
> is happy again and the new files were actually removed from the sources
> to use the auto generated versions.
> Also patch d5c1801a018efda8ac2b was partially reverted as the files
> can not be compiled to the LOCAL_PATH, instead they should live on the
> intermediates folder so that a clean can wipe them out.
> Change-Id: I75e86453d23f6b6f0e2a7dfb1b48272965c9fbf2
> Signed-off-by: Daniel Charles <daniel.charles at intel.com>
> ---
>  src/mesa/Android.gen.mk |   68 +++++--
>  src/mesa/Android.mk     |    1 -
>  src/mesa/Makefile.am    |    4 +-
>  src/mesa/sources.mak    |  561 ++++++++++++++++++++++++-----------------------
>  4 files changed, 337 insertions(+), 297 deletions(-)

Looks good to me.
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

I'll commit this tomorrow if no one objects.

More information about the mesa-dev mailing list