Module: Mesa Branch: master Commit: be2818387dd5007667d427e3d7b8f738f5fc59d4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=be2818387dd5007667d427e3d7b8f738f5fc59d4
Author: Mauro Rossi <[email protected]> Date: Sat Sep 5 18:49:19 2020 +0200 android: util: fix missing include path Fixes the following building error: external/mesa/src/util/format/u_format_bptc.c:28:10: fatal error: 'u_format_pack.h' file not found ^~~~~~~~~~~~~~~~~ 1 error generated. Fixes: 8d38b2578 ("util: Explicitly call the unpack functions from inside bptc pack/unpack.") Signed-off-by: Mauro Rossi <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6619> --- src/util/Android.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/util/Android.mk b/src/util/Android.mk index ec37c69a502..6972ae58f7b 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -34,13 +34,20 @@ LOCAL_SRC_FILES := \ $(MESA_UTIL_FILES) \ $(XMLCONFIG_FILES) +LOCAL_MODULE := libmesa_util + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES + +intermediates := $(call local-generated-sources-dir) + LOCAL_C_INCLUDES := \ external/zlib \ $(MESA_TOP)/src/mesa \ $(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/auxiliary \ - $(MESA_TOP)/src/util/format + $(MESA_TOP)/src/util/format \ + $(intermediates)/format # If Android version >=8 MESA should static link libexpat else should dynamic link ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0) @@ -53,14 +60,8 @@ endif LOCAL_SHARED_LIBRARIES += liblog -LOCAL_MODULE := libmesa_util - # Generated sources -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)) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
