commit f444ac5e6026d58b77ffada92698773127c734cd
author Tapani Pälli <tapani.palli@intel.com> Tue Aug 01 14:23:00 2017 +0300
committer Tapani Pälli <tapani.palli@intel.com> Wed Aug 02 10:32:48 2017 +0300
tree 228f5c36231077d73230b3086663a6edda49d798
parent 99c764b647c815533d45450e3a6f67ff192ee2af

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>

src/util/Android.mk

diff --git a/src/util/Android.mk b/src/util/Android.mk
index ecf3eb7..7e54ae7 100644
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -51,6 +51,9 @@
 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)