Android building error after commit f08d8c84
Hi @jljusten and @jekstrand
Could you please check the cause of the following building error?
FAILED: out/target/product/x86_64/obj/SHARED_LIBRARIES/vulkan.android-x86_intermediates/LINKED/vulkan.android-x86.so
...
ld.lld: error: duplicate symbol: isl_gen12_choose_image_alignment_el
>>> defined at isl_gen12.c:39 (external/mesa/src/intel/isl/isl_gen12.c:39)
>>> isl_gen12.o:(isl_gen12_choose_image_alignment_el) in archive out/target/product/x86_64/obj/STATIC_LIBRARIES/libmesa
_isl_intermediates/libmesa_isl.a
>>> defined at isl_gen12.c:39 (external/mesa/src/intel/isl/isl_gen12.c:39)
>>> isl_gen12.o:(.text.isl_gen12_choose_image_alignment_el+0x0) in archive out/target/product/x86_64/obj/STATIC_LIBRARI
ES/libmesa_isl_intermediates/libmesa_isl.a
Based on comparison with libmesa_isl_gen75 in Makefile.sources, could you please check if the following change would be correct?
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 4450f047961..df0de7558c1 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -240,8 +240,6 @@ ISL_GEN12_FILES = \
isl/isl_surface_state.c
ISL_GEN125_FILES = \
- isl/isl_gen12.c \
- isl/isl_gen12.h \
isl/isl_emit_depth_stencil.c \
isl/isl_surface_state.c