android: export intermediates from libmesa_util

Fixes following build issues:

   In file included from vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/common/dri_util.c:45:
   vendor/intel/external/android_ia/mesa/src/util/xmlpool.h:103:10: fatal error: 'xmlpool/options.h' file not found
   ...
   In file included from vendor/intel/external/android_ia/mesa/src/mesa/drivers/dri/i965/intel_screen.c:44:
   vendor/intel/external/android_ia/mesa/src/util/xmlpool.h:103:10: fatal error: 'xmlpool/options.h' file not found

Fixes: 601093f9 (xmlconfig: move into src/util)
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Chih-Wei Huang <cwhuang@linux.org.tw>

diff --git a/src/mesa/drivers/dri/common/Android.mk b/src/mesa/drivers/dri/common/Android.mk
index 573189d88f644e08be35516d4edb488f9b8661e3..f15a3b9c786aed89dda2687551a206367b6a5a63 100644 (file)
--- a/src/mesa/drivers/dri/common/Android.mk
+++ b/src/mesa/drivers/dri/common/Android.mk
@@ -46,6 +46,8 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
 LOCAL_SRC_FILES := \
        $(DRI_COMMON_FILES)
 
+LOCAL_STATIC_LIBRARIES := libmesa_util
+
 include $(MESA_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
 

diff --git a/src/util/Android.mk b/src/util/Android.mk
index ecf3eb757406e9c327fcc136957d4b45e9794413..7e54ae701343919f72e1dffc84e48ff2a8ca5795 100644 (file)
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -51,6 +51,9 @@ LOCAL_MODULE := libmesa_util
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir)
+
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
+
 UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
 LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)