diff options
| author | Tomasz Figa <tomasz.figa@gmail.com> | 2014-09-27 16:20:01 +0200 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-10-03 01:28:02 +0100 |
| commit | c90cd077bd9c1c103d8ef36d6286599af5b3645e (patch) | |
| tree | a94bc6efedd1f3a42a7387d52c64c3364591e9af | |
| parent | dffbee6668f93bbaa32c1f13c8f5d5f2ffbb5b12 (diff) | |
| download | mesa-c90cd077bd9c1c103d8ef36d6286599af5b3645e.tar.gz | |
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 <tomasz.figa@gmail.com>
CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
(cherry picked from commit b4ffd19e6c9f61dfa4e0eda1f606cd255b27208f)
| -rw-r--r-- | src/mesa/Android.libmesa_dricore.mk | 2 | ||||
| -rw-r--r-- | src/mesa/Android.libmesa_st_mesa.mk | 2 | ||||
| -rw-r--r-- | src/mesa/program/Android.mk | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk index e1a5a170277..1e6d9487204 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 e486e1a8c3b..8b8d652a3f4 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 a237b65bc08..19c4be0feba 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) |