[Mesa-dev] [PATCH 3/6] android: export the path of the generated headers

[Chih-Wei Huang]

The modules need the headers can get the path automatically.

Signed-off-by: Chih-Wei Huang <cwhuang at linux.org.tw>
---
 src/mesa/Android.libmesa_dricore.mk    | 1 -
 src/mesa/Android.libmesa_st_mesa.mk    | 1 -
 src/mesa/drivers/dri/Android.mk        | 2 --
 src/mesa/drivers/dri/common/Android.mk | 2 ++
 src/mesa/program/Android.mk            | 2 ++
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index da6176a..7758d54 100644
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -60,7 +60,6 @@ LOCAL_CFLAGS += \
 endif
 
 LOCAL_C_INCLUDES := \
-	$(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
 	$(MESA_TOP)/src/mapi \
 	$(MESA_TOP)/src/mesa/main \
 	$(MESA_TOP)/src/glsl \
diff --git a/src/mesa/Android.libmesa_st_mesa.mk b/src/mesa/Android.libmesa_st_mesa.mk
index e02030b..b4b7fd9 100644
--- a/src/mesa/Android.libmesa_st_mesa.mk
+++ b/src/mesa/Android.libmesa_st_mesa.mk
@@ -52,7 +52,6 @@ LOCAL_CFLAGS := \
 endif
 
 LOCAL_C_INCLUDES := \
-	$(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
 	$(MESA_TOP)/src/mapi \
 	$(MESA_TOP)/src/mesa/main \
 	$(MESA_TOP)/src/glsl \
diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index 09ce55a..d399666 100644
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -34,8 +34,6 @@ MESA_DRI_CFLAGS := \
 	-DHAVE_ANDROID_PLATFORM
 
 MESA_DRI_C_INCLUDES := \
-	$(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_dri_common) \
-	$(call intermediates-dir-for,STATIC_LIBRARIES,libmesa_glsl)/nir \
 	$(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \
 	$(MESA_TOP)/src/gallium/include \
 	$(MESA_TOP)/src/gallium/auxiliary \
diff --git a/src/mesa/drivers/dri/common/Android.mk b/src/mesa/drivers/dri/common/Android.mk
index 458e4e9..511d4af 100644
--- a/src/mesa/drivers/dri/common/Android.mk
+++ b/src/mesa/drivers/dri/common/Android.mk
@@ -39,6 +39,8 @@ intermediates := $(call local-generated-sources-dir)
 LOCAL_C_INCLUDES := \
     $(MESA_DRI_C_INCLUDES)
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
+
 # swrast only
 ifeq ($(MESA_GPU_DRIVERS),swrast)
 LOCAL_CFLAGS := -D__NOT_HAVE_DRM_H
diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
index 9a6f962..ccb0fa5 100644
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -78,5 +78,7 @@ LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/gallium/auxiliary \
 	$(MESA_TOP)/src/gallium/include
 
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
-- 
1.9.1