From f699bb42af2b4d3959ac04ce86f1a096dc85fe69 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Sun, 19 Apr 2020 19:15:58 +0300 Subject: [PATCH] panfrost: Align Android makefiles with recent changes Signed-off-by: Roman Stratiienko Reviewed-by: Alyssa Rosenzweig Part-of: --- src/panfrost/Android.bifrost.mk | 11 +++++++++++ src/panfrost/Makefile.sources | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/src/panfrost/Android.bifrost.mk b/src/panfrost/Android.bifrost.mk index d30ddfadf40..3c77cb4dac2 100644 --- a/src/panfrost/Android.bifrost.mk +++ b/src/panfrost/Android.bifrost.mk @@ -21,6 +21,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := libpanfrost_bifrost +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +intermediates := $(call local-generated-sources-dir) LOCAL_SRC_FILES := \ $(bifrost_FILES) @@ -41,8 +43,17 @@ LOCAL_STATIC_LIBRARIES := \ libmesa_st_mesa LOCAL_GENERATED_SOURCES := \ + $(intermediates)/bifrost_nir_algebraic.c \ $(MESA_GEN_GLSL_H) +bifrost_nir_algebraic_gen := $(LOCAL_PATH)/bifrost/bifrost_nir_algebraic.py +bifrost_nir_algebraic_deps := \ + $(MESA_TOP)/src/compiler/nir/ + +$(intermediates)/bifrost_nir_algebraic.c: $(bifrost_nir_algebraic_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(bifrost_nir_algebraic_gen) -p $< > $@ + LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(MESA_TOP)/src/panfrost/bifrost/ \ diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources index e5d1f11d5d6..2e9a026f27d 100644 --- a/src/panfrost/Makefile.sources +++ b/src/panfrost/Makefile.sources @@ -2,12 +2,16 @@ bifrost_FILES := \ bifrost/bifrost.h \ bifrost/bifrost_compile.c \ bifrost/bifrost_compile.h \ + bifrost/bi_liveness.c \ bifrost/bi_lower_combine.c \ bifrost/bi_tables.c \ bifrost/bi_schedule.c \ bifrost/bi_special.c \ + bifrost/bi_pack.c \ bifrost/bi_print.c \ bifrost/bi_print.h \ + bifrost/bi_ra.c \ + bifrost/bi_opt_dce.c \ bifrost/bi_quirks.h \ bifrost/bir.c \ bifrost/compiler.h \ -- 2.30.2