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
Signed-off-by: Tapani Pälli <tapani.pa...@intel.com>
---
src/mesa/drivers/dri/common/Android.mk | 2 ++
src/util/Android.mk | 3 +++
2 files changed, 5 insertions(+)
diff --git a/src/mesa/drivers/dri/common/Android.mk
b/src/mesa/drivers/dri/common/Android.mk
index 573189d..f15a3b9 100644
--- 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 ecf3eb7..7e54ae7 100644
--- 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)
--
2.9.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
