Mesa (master): android: mesa: Move the FXT1 compressor/decompressor to util/

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 3468c0dd4dd8f2b6de05479de87483218653bed1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3468c0dd4dd8f2b6de05479de87483218653bed1

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Wed Feb 24 02:57:22 2021 +0100

android: mesa: Move the FXT1 compressor/decompressor to util/

After commit a46b73e in order to build mesa for Android
we need to generate $(intermediates)/util/format/u_format_pack.h
instead of $(intermediates)/format/u_format_pack.h

Fixes the following building error in Android build:

external/mesa/src/util/format/u_format_fxt1.c:28:10: fatal error: 'util/format/u_format_pack.h' file not found
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.

Fixes: a46b73e ("mesa: Move the FXT1 compressor/decompressor to util/")
Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9240>

---

 src/util/Android.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/util/Android.mk b/src/util/Android.mk
index a6d381fb474..0c0f7397bc8 100644
--- a/src/util/Android.mk
+++ b/src/util/Android.mk
@@ -47,7 +47,8 @@ LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/gallium/include \
 	$(MESA_TOP)/src/gallium/auxiliary \
 	$(MESA_TOP)/src/util/format \
-	$(intermediates)/format
+	$(intermediates)/util/format \
+	$(intermediates)
 
 # If Android version >=8 MESA should static link libexpat else should dynamic link
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27; echo $$?), 0)
@@ -64,7 +65,8 @@ LOCAL_SHARED_LIBRARIES += liblog libsync libcutils
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
 
-UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
+# Some sources do require "util/format/u_format_pack.h" generated header
+UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(subst format/u_format_pack.h,util/format/u_format_pack.h,$(MESA_UTIL_GENERATED_FILES)))
 LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)
 
 format_srgb_gen := $(LOCAL_PATH)/format_srgb.py
@@ -78,7 +80,7 @@ u_format_deps := $(LOCAL_PATH)/format/u_format.csv \
 	$(LOCAL_PATH)/format/u_format_pack.py \
 	$(LOCAL_PATH)/format/u_format_parse.py
 
-$(intermediates)/format/u_format_pack.h: $(u_format_deps)
+$(intermediates)/util/format/u_format_pack.h: $(u_format_deps)
 	@mkdir -p $(dir $@)
 	$(hide) $(MESA_PYTHON2) $(u_format_gen) --header $< > $@