lima: Fix Android.mk

1. Update LOCAL_SRC_FILES according to commit
54434fe670 ("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 5adfc8602c
("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>
This commit is contained in:
Roman Stratiienko 2019-08-06 10:23:45 +03:00
parent 26a01a6797
commit 28061e0ab0
2 changed files with 18 additions and 4 deletions

View file

@ -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)

View file

@ -55,7 +55,8 @@ endif
LOCAL_STATIC_LIBRARIES += \
libfreedreno_drm \
libfreedreno_ir3
libfreedreno_ir3 \
libpanfrost_shared \
ifeq ($(USE_LIBBACKTRACE),true)
LOCAL_SHARED_LIBRARIES += libbacktrace