fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

android: driconf: Generate a static table when no xmlconfig

Browse source 
Fixes the following building error:

FAILED: out/target/product/x86_64/obj_x86/STATIC_LIBRARIES/libmesa_util_intermediates/xmlconfig.o
...
external/mesa/src/util/xmlconfig.c:1030:12: fatal error: 'driconf_static.h' file not found
           ^~~~~~~~~~~~~~~~~~
1 error generated.

Fixes: a6b0ceb ("driconf: Generate a static table when no xmlconfig")
Acked-by: Rob Clark <robclark@freedesktop.org>
Tested-by: Marijn Suijten <marijn.suijten@somainline.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9294>
This commit is contained in:
Mauro Rossi 2021-02-25 21:54:00 +01:00 • committed by Marge Bot
parent 38d5dc9400
commit 1cd3b57db8
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/util/Android.mk
View file

@ -69,6 +69,13 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
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)
driconf_static_gen := $(LOCAL_PATH)/driconf_static.py
driconf_static_deps := $(LOCAL_PATH)/00-mesa-defaults.conf
$(intermediates)/driconf_static.h: $(driconf_static_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $(driconf_static_gen) $^ $@
format_srgb_gen := $(LOCAL_PATH)/format_srgb.py
$(intermediates)/format_srgb.c: $(format_srgb_gen)

1
src/util/Makefile.sources
View file

@ -145,6 +145,7 @@ MESA_UTIL_FILES := \
MESA_UTIL_GENERATED_FILES = \
driconf_static.h \
format_srgb.c \
format/u_format_table.c \
format/u_format_pack.h