From f444ac5e6026d58b77ffada92698773127c734cd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 1 Aug 2017 14:23:00 +0300 Subject: [PATCH] android: export intermediates from libmesa_util MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Chih-Wei Huang --- 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 573189d88f6..f15a3b9c786 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 ecf3eb75740..7e54ae70134 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.30.2