Module: Mesa Branch: 10.3 Commit: c90cd077bd9c1c103d8ef36d6286599af5b3645e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c90cd077bd9c1c103d8ef36d6286599af5b3645e
Author: Tomasz Figa <[email protected]> Date: Sat Sep 27 16:20:01 2014 +0200 st/mesa: Fix paths used in Android builds With current makefiles the build fails because source and build paths are generated incorrectly. With Android build system the top_srcdir and top_builddir variables are undefined and all paths are relative to where Android.mk is located. This ends up with path likes external/mesa/src/mesa/src/mesa/ for both source and build paths, which are obviously wrong. This patch fixes this by overriding resulting SRCDIR and BUILDDIR variables with empty string, so that paths end up being relative to Android.mk file again. Appending correct build path to generated files is already done in Android.gen.mk. Signed-off-by: Tomasz Figa <[email protected]> CC: <[email protected]> Reviewed-by: Emil Velikov <[email protected]> (cherry picked from commit b4ffd19e6c9f61dfa4e0eda1f606cd255b27208f) --- src/mesa/Android.libmesa_dricore.mk | 2 ++ src/mesa/Android.libmesa_st_mesa.mk | 2 ++ src/mesa/program/Android.mk | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index e1a5a17..1e6d948 100644 --- a/src/mesa/Android.libmesa_dricore.mk +++ b/src/mesa/Android.libmesa_dricore.mk @@ -32,6 +32,8 @@ LOCAL_PATH := $(call my-dir) # MESA_FILES # X86_FILES include $(LOCAL_PATH)/Makefile.sources +SRCDIR := +BUILDDIR := include $(CLEAR_VARS) diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk index e486e1a..8b8d652 100644 --- a/src/mesa/Android.libmesa_st_mesa.mk +++ b/src/mesa/Android.libmesa_st_mesa.mk @@ -32,6 +32,8 @@ LOCAL_PATH := $(call my-dir) # MESA_GALLIUM_FILES. # X86_FILES include $(LOCAL_PATH)/Makefile.sources +SRCDIR := +BUILDDIR := include $(CLEAR_VARS) diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk index a237b65..19c4be0 100644 --- a/src/mesa/program/Android.mk +++ b/src/mesa/program/Android.mk @@ -39,6 +39,8 @@ endef # Import the following variables: # PROGRAM_FILES include $(MESA_TOP)/src/mesa/Makefile.sources +SRCDIR := +BUILDDIR := include $(CLEAR_VARS) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
