mesa: Add ir3/ir3_nir_imul.c generation to Android.mk

With current master we're seeing build failures with AOSP:
  error: undefined symbol: ir3_nir_lower_imul

This is due to the ir3_nir_imul.c file not being generated
in the Android.mk files.

This patch simply adds it to the Android build, after which
thigns build and book ok on db410c.

Cc: Rob Clark <robdclark@chromium.org>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Greg Hartman <ghartman@google.com>
Cc: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: John Stultz <john.stultz@linaro.org>

diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources
index 5b983266a628f8886a22e39985edd6c29a5c2d5c..cf3ac7bdba407e107e2c67fb8bb7f110c033cbe6 100644 (file)
--- a/src/freedreno/Makefile.sources
+++ b/src/freedreno/Makefile.sources
@@ -48,4 +48,5 @@ ir3_SOURCES := \
        ir3/ir3_sun.c
 
 ir3_GENERATED_FILES := \
-       ir3/ir3_nir_trig.c
+       ir3/ir3_nir_trig.c \
+       ir3/ir3_nir_imul.c

diff --git a/src/gallium/drivers/freedreno/Android.gen.mk b/src/gallium/drivers/freedreno/Android.gen.mk
index d29ba159d5cf377c23d54b6622f1e7202cd3fff3..21ee52b7e33ec8926301e1718607a7d53f9efc3e 100644 (file)
--- a/src/gallium/drivers/freedreno/Android.gen.mk
+++ b/src/gallium/drivers/freedreno/Android.gen.mk
@@ -28,11 +28,19 @@ ir3_nir_trig_deps := \
        $(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \
        $(MESA_TOP)/src/compiler/nir/nir_algebraic.py
 
+ir3_nir_imul_deps := \
+       $(MESA_TOP)/src/freedreno/ir3/ir3_nir_imul.py \
+       $(MESA_TOP)/src/compiler/nir/nir_algebraic.py
+
 intermediates := $(call local-generated-sources-dir)
 
 $(intermediates)/ir3/ir3_nir_trig.c: $(ir3_nir_trig_deps)
        @mkdir -p $(dir $@)
        $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@
 
+$(intermediates)/ir3/ir3_nir_imul.c: $(ir3_nir_imul_deps)
+       @mkdir -p $(dir $@)
+       $(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@
+
 LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
        $(ir3_GENERATED_FILES))