fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-07 03:20:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: Fix paths used in Android builds

Browse source 
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 b4ffd19e6c)
This commit is contained in:
Tomasz Figa 2014-09-27 16:20:01 +02:00 • committed by Emil Velikov
parent dffbee6668
commit c90cd077bd
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/Android.libmesa_dricore.mk
View file

@ -32,6 +32,8 @@ LOCAL_PATH := $(call my-dir)
# MESA_FILES
# X86_FILES
include $(LOCAL_PATH)/Makefile.sources
SRCDIR :=
BUILDDIR :=
include $(CLEAR_VARS)

2
src/mesa/Android.libmesa_st_mesa.mk
View file

@ -32,6 +32,8 @@ LOCAL_PATH := $(call my-dir)
# MESA_GALLIUM_FILES.
# X86_FILES
include $(LOCAL_PATH)/Makefile.sources
SRCDIR :=
BUILDDIR :=
include $(CLEAR_VARS)

2
src/mesa/program/Android.mk
View file

@ -39,6 +39,8 @@ endef
# Import the following variables:
# PROGRAM_FILES
include $(MESA_TOP)/src/mesa/Makefile.sources
SRCDIR :=
BUILDDIR :=
include $(CLEAR_VARS)