[Mesa-dev] [PATCH] android: export intermediates from libmesa_util

[Chih-Wei Huang]

2017-08-01 19:23 GMT+08:00 Tapani Pälli <tapani.palli at intel.com>:
> 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.palli at 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)
>
> --

Looks good to me.

I suggest to add this to commit message

Fixes: 601093f9 (xmlconfig: move into src/util)
(yes, I believe it causes the issue)

Review-by: Chih-Wei Huang <cwhuang at linux.org.tw>


-- 
Chih-Wei
Android-x86 project
http://www.android-x86.org