android: add $(mesa_top)/src include to the whole of mesa

Many parts of mesa already have the include with others depending on it
but it's missing. Add it once at the top makefile and be done with it.

Cc: "10.4 10.5" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>

diff --git a/Android.common.mk b/Android.common.mk
index e34f206609ba1d857c06bc55bcefae8fb4217faf..f473a4bce3259dec518f4fff5a6275f53efb185f 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -31,6 +31,7 @@ endif
 endif
 
 LOCAL_C_INCLUDES += \
+       $(MESA_TOP)/src \
        $(MESA_TOP)/include
 
 MESA_VERSION := $(shell cat $(MESA_TOP)/VERSION)

diff --git a/src/gallium/auxiliary/Android.mk b/src/gallium/auxiliary/Android.mk
index 0bc183170868c7ab1d0db10d127bd340078cc4dd..c7b2634b63c9746851ac4c5f5d51674390488fb3 100644 (file)
--- a/src/gallium/auxiliary/Android.mk
+++ b/src/gallium/auxiliary/Android.mk
@@ -33,8 +33,7 @@ LOCAL_SRC_FILES := \
        $(VL_STUB_SOURCES)
 
 LOCAL_C_INCLUDES := \
-       $(GALLIUM_TOP)/auxiliary/util \
-       $(MESA_TOP)/src
+       $(GALLIUM_TOP)/auxiliary/util
 
 LOCAL_MODULE := libmesa_gallium
 

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 38c2087a493b7658ffd0ac83079b2b7381bc5606..2ac1ffb5cdce74601a7e3f645b3f31574dfe78e9 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -38,7 +38,6 @@ LOCAL_SRC_FILES := \
        $(LIBGLSL_FILES)
 
 LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa
 
@@ -59,7 +58,6 @@ LOCAL_SRC_FILES := \
        $(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa
 

diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index e4a52677cf805064bfc3c15db91d96c2cda2819a..73afcc7d90b3fe2a0eb71012351749502eaa78c6 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -61,7 +61,6 @@ endif
 
 LOCAL_C_INCLUDES := \
        $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
-       $(MESA_TOP)/src \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/glsl \
        $(MESA_TOP)/src/gallium/auxiliary

diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk
index a9f6ff59a275ea98643a005d63cc2db8fff73cca..b7e64c593a6224f43576e06bb6e698c41d9eec13 100644 (file)
--- a/src/mesa/Android.libmesa_glsl_utils.mk
+++ b/src/mesa/Android.libmesa_glsl_utils.mk
@@ -36,7 +36,6 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_glsl_utils
 
 LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src \
        $(MESA_TOP)/src/glsl \
        $(MESA_TOP)/src/mapi
 
@@ -59,7 +58,6 @@ LOCAL_IS_HOST_MODULE := true
 LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L
 
 LOCAL_C_INCLUDES := \
-       $(MESA_TOP)/src \
        $(MESA_TOP)/src/glsl \
        $(MESA_TOP)/src/mapi
 

diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk
index a08366d53eb6886938e024c769e14ff840e18251..fdf847a07949bc72924c835bcf2eb371489e2252 100644 (file)
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -55,7 +55,6 @@ LOCAL_C_INCLUDES := \
        $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
        $(MESA_TOP)/src/gallium/auxiliary \
        $(MESA_TOP)/src/gallium/include \
-       $(MESA_TOP)/src \
        $(MESA_TOP)/src/glsl \
        $(MESA_TOP)/src/mapi
 

diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index d1c836be37006fb5cd2c5c0297361bb5f916007b..e168fe03f84082a828ee0c5cfaf2bef6a8670f1f 100644 (file)
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -35,7 +35,6 @@ MESA_DRI_CFLAGS := \
        -DHAVE_ANDROID_PLATFORM
 
 MESA_DRI_C_INCLUDES := \
-       $(MESA_TOP)/src \
        $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \
        $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
        external/expat/lib

diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
index a237b65bc0865ddbabc0360f16fa2349885daae9..e85afe67253039f6b5b9851deb5806869639705a 100644 (file)
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -71,7 +71,6 @@ $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
 
 LOCAL_C_INCLUDES := \
        $(intermediates) \
-       $(MESA_TOP)/src \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa \
        $(MESA_TOP)/src/glsl

diff --git a/src/util/Android.mk b/src/util/Android.mk
index 2eb0ef7a7061c68af95da25ce2fae941e7d623de..c2c0cb39312e9e8b78fb5b3cb1abcfb6d1059891 100644 (file)
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -35,8 +35,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mesa \
-       $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src
+       $(MESA_TOP)/src/mapi
 
 LOCAL_MODULE := libmesa_util
 
@@ -69,8 +68,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mesa \
-       $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src
+       $(MESA_TOP)/src/mapi
 
 LOCAL_MODULE := libmesa_util