From: Roman Stratiienko <roman.stratiienko@globallogic.com>
Date: Tue, 6 Aug 2019 07:23:45 +0000 (+0300)
Subject: lima: Fix Android.mk
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=28061e0ab03dcbcaad32c66fa8f427d94a09c5a0;p=mesa.git

lima: Fix Android.mk

1. Update LOCAL_SRC_FILES according to commit
54434fe67068 ("lima/gpir: Rework the scheduler").

2. Add libpanfrost_shared.a dependency.

3. Generate lima_nir_algebraic.c with Android.mk
Fixes Android build error introduced by commit 5adfc8602c63
("lima/ppir: move sin/cos input scaling into NIR")

Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com>
Reviewed-by: Vasily Khoruzhick <anarsoul@gmail.com>
Acked-by: Qiang Yu <yuq825@gmail.com>
---

diff --git a/src/gallium/drivers/lima/Android.mk b/src/gallium/drivers/lima/Android.mk
index 516e714deff..069ecc4b23c 100644
--- a/src/gallium/drivers/lima/Android.mk
+++ b/src/gallium/drivers/lima/Android.mk
@@ -31,10 +31,9 @@ LOCAL_SRC_FILES := \
 	ir/gp/lower.c \
 	ir/gp/nir.c \
 	ir/gp/node.c \
-	ir/gp/physical_regalloc.c \
+	ir/gp/regalloc.c \
 	ir/gp/reduce_scheduler.c \
 	ir/gp/scheduler.c \
-	ir/gp/value_regalloc.c \
 	ir/lima_ir.h \
 	ir/lima_nir_lower_uniform_to_scalar.c \
 	ir/pp/codegen.c \
@@ -74,7 +73,21 @@ LOCAL_MODULE := libmesa_pipe_lima
 
 LOCAL_SHARED_LIBRARIES := libdrm
 
-LOCAL_STATIC_LIBRARIES := libmesa_nir
+LOCAL_STATIC_LIBRARIES := \
+	libmesa_nir \
+	libpanfrost_shared \
+
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+
+intermediates := $(call local-generated-sources-dir)
+
+$(intermediates)/lima_nir_algebraic.c: $(LOCAL_PATH)/ir/lima_nir_algebraic.py
+	@echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))"
+	@mkdir -p $(dir $@)
+	$(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir/ > $@
+
+LOCAL_GENERATED_SOURCES := \
+	$(intermediates)/lima_nir_algebraic.c \
 
 include $(GALLIUM_COMMON_MK)
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 10b27a80ef3..c7d564a237e 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -55,7 +55,8 @@ endif
 
 LOCAL_STATIC_LIBRARIES += \
 	libfreedreno_drm \
-	libfreedreno_ir3
+	libfreedreno_ir3 \
+	libpanfrost_shared \
 
 ifeq ($(USE_LIBBACKTRACE),true)
 	LOCAL_SHARED_LIBRARIES += libbacktrace