android: add gallium dirs to more places in the tree

Similar to e8c5cbfd921(mesa: Add gallium include dirs to more parts of
the tree.)

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>

diff --git a/src/glsl/Android.mk b/src/glsl/Android.mk
index 2ac1ffb5cdce74601a7e3f645b3f31574dfe78e9..356f44e403345270905acffb2a78dc0ae925484f 100644 (file)
--- a/src/glsl/Android.mk
+++ b/src/glsl/Android.mk
@@ -39,7 +39,9 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/mesa
+       $(MESA_TOP)/src/mesa \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_MODULE := libmesa_glsl
 
@@ -59,7 +61,9 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \
-       $(MESA_TOP)/src/mesa
+       $(MESA_TOP)/src/mesa \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util
 

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

diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk
index b7e64c593a6224f43576e06bb6e698c41d9eec13..3497377af8c8b17f781060d59f569b55c1d09685 100644 (file)
--- a/src/mesa/Android.libmesa_glsl_utils.mk
+++ b/src/mesa/Android.libmesa_glsl_utils.mk
@@ -37,7 +37,9 @@ LOCAL_MODULE := libmesa_glsl_utils
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/glsl \
-       $(MESA_TOP)/src/mapi
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_SRC_FILES := \
        main/imports.c \
@@ -59,7 +61,9 @@ LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/glsl \
-       $(MESA_TOP)/src/mapi
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_SRC_FILES := \
        main/imports.c \

diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index e168fe03f84082a828ee0c5cfaf2bef6a8670f1f..28a332b0422e4c81806a9a2951e03da9cda7fbe6 100644 (file)
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -37,6 +37,8 @@ MESA_DRI_CFLAGS := \
 MESA_DRI_C_INCLUDES := \
        $(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \
        $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary \
        external/expat/lib
 
 MESA_DRI_WHOLE_STATIC_LIBRARIES := \

diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
index e85afe67253039f6b5b9851deb5806869639705a..e957a8d573802d3fef6896e187cda55a0e25aa1d 100644 (file)
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -73,7 +73,9 @@ LOCAL_C_INCLUDES := \
        $(intermediates) \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/mesa \
-       $(MESA_TOP)/src/glsl
+       $(MESA_TOP)/src/glsl \
+       $(MESA_TOP)/src/gallium/auxiliary \
+       $(MESA_TOP)/src/gallium/include
 
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/util/Android.mk b/src/util/Android.mk
index c2c0cb39312e9e8b78fb5b3cb1abcfb6d1059891..e6530eaf3cb567724a00045a3c153a2d8af712f9 100644 (file)
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -35,7 +35,9 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mesa \
-       $(MESA_TOP)/src/mapi
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_MODULE := libmesa_util
 
@@ -68,7 +70,9 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mesa \
-       $(MESA_TOP)/src/mapi
+       $(MESA_TOP)/src/mapi \
+       $(MESA_TOP)/src/gallium/include \
+       $(MESA_TOP)/src/gallium/auxiliary
 
 LOCAL_MODULE := libmesa_util