Module: Mesa Branch: master Commit: de352f58c3817ed5b399d211a1b2603510716e85 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=de352f58c3817ed5b399d211a1b2603510716e85
Author: Mauro Rossi <[email protected]> Date: Mon Aug 10 15:01:30 2020 +0200 android: panfrost: Rename encoder/ to lib/ Fixes the following building errors: target C: libpanfrost_encoder <= external/mesa/src/panfrost/encoder/pan_attributes.c ... clang: error: no such file or directory: 'external/mesa/src/panfrost/encoder/pan_attributes.c' clang: error: no input files target C: libpanfrost_encoder <= external/mesa/src/panfrost/encoder/pan_afbc.c ... clang: error: no such file or directory: 'external/mesa/src/panfrost/encoder/pan_afbc.c' clang: error: no input files Fixes: 1c62b5528 ("panfrost: Rename encoder/ to lib/") Signed-off-by: Mauro Rossi <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6261> --- src/gallium/drivers/panfrost/Android.mk | 2 +- src/gallium/targets/dri/Android.mk | 2 +- .../{Android.encoder.mk => Android.lib.mk} | 10 +++--- src/panfrost/Android.mk | 2 +- src/panfrost/Android.pandecode.mk | 6 ++-- src/panfrost/Makefile.sources | 40 +++++++++++----------- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/gallium/drivers/panfrost/Android.mk b/src/gallium/drivers/panfrost/Android.mk index c7ad6e1759b..c6d7abfbd30 100644 --- a/src/gallium/drivers/panfrost/Android.mk +++ b/src/gallium/drivers/panfrost/Android.mk @@ -43,7 +43,7 @@ LOCAL_STATIC_LIBRARIES := \ libmesa_winsys_panfrost \ libpanfrost_bifrost \ libpanfrost_decode \ - libpanfrost_encoder \ + libpanfrost_lib \ libpanfrost_midgard \ libpanfrost_shared \ libpanfrost_util \ diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 7506d8211e6..244f67852f2 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -63,7 +63,7 @@ LOCAL_STATIC_LIBRARIES += \ libmesa_gallium \ libpanfrost_bifrost \ libpanfrost_decode \ - libpanfrost_encoder \ + libpanfrost_lib \ libpanfrost_midgard \ libpanfrost_shared \ libpanfrost_util \ diff --git a/src/panfrost/Android.encoder.mk b/src/panfrost/Android.lib.mk similarity index 89% rename from src/panfrost/Android.encoder.mk rename to src/panfrost/Android.lib.mk index 9e57adc4060..cda70388607 100644 --- a/src/panfrost/Android.encoder.mk +++ b/src/panfrost/Android.lib.mk @@ -20,15 +20,15 @@ include $(CLEAR_VARS) -LOCAL_MODULE := libpanfrost_encoder +LOCAL_MODULE := libpanfrost_lib LOCAL_SRC_FILES := \ - $(encoder_FILES) + $(lib_FILES) LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/gallium/auxiliary/ \ $(MESA_TOP)/src/gallium/include/ \ - $(MESA_TOP)/src/panfrost/encoder/ \ + $(MESA_TOP)/src/panfrost/lib/ \ $(MESA_TOP)/src/panfrost/include/ LOCAL_STATIC_LIBRARIES := \ @@ -37,7 +37,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_GENERATED_SOURCES := \ LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(MESA_TOP)/src/panfrost/encoder/ \ + $(MESA_TOP)/src/panfrost/lib/ \ include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Android.mk b/src/panfrost/Android.mk index 670f60f3e32..b76a99a291d 100644 --- a/src/panfrost/Android.mk +++ b/src/panfrost/Android.mk @@ -27,7 +27,7 @@ LOCAL_PATH := $(call my-dir) include $(LOCAL_PATH)/Makefile.sources include $(LOCAL_PATH)/Android.util.mk include $(LOCAL_PATH)/Android.bifrost.mk -include $(LOCAL_PATH)/Android.encoder.mk +include $(LOCAL_PATH)/Android.lib.mk include $(LOCAL_PATH)/Android.midgard.mk include $(LOCAL_PATH)/Android.shared.mk include $(LOCAL_PATH)/Android.pandecode.mk diff --git a/src/panfrost/Android.pandecode.mk b/src/panfrost/Android.pandecode.mk index 76c5ce9a763..6ddb914875b 100644 --- a/src/panfrost/Android.pandecode.mk +++ b/src/panfrost/Android.pandecode.mk @@ -29,11 +29,11 @@ LOCAL_C_INCLUDES := \ $(MESA_TOP)/src/gallium/auxiliary/ \ $(MESA_TOP)/src/gallium/include/ \ $(MESA_TOP)/src/panfrost/include/ \ - $(MESA_TOP)/src/panfrost/encoder/ \ + $(MESA_TOP)/src/panfrost/lib/ \ $(MESA_TOP)/src/panfrost/pandecode/ LOCAL_STATIC_LIBRARIES := \ - libpanfrost_encoder + libpanfrost_lib LOCAL_GENERATED_SOURCES := \ @@ -41,4 +41,4 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(MESA_TOP)/src/panfrost/pandecode/ \ include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +include $(BUILD_STATIC_LIBRARY) diff --git a/src/panfrost/Makefile.sources b/src/panfrost/Makefile.sources index d34e71dfbca..4c817dc1d58 100644 --- a/src/panfrost/Makefile.sources +++ b/src/panfrost/Makefile.sources @@ -20,26 +20,26 @@ bifrost_FILES := \ bifrost/disassemble.c \ bifrost/disassemble.h -encoder_FILES := \ - encoder/pan_afbc.c \ - encoder/pan_attributes.c \ - encoder/pan_bo.c \ - encoder/pan_bo.h \ - encoder/pan_blit.c \ - encoder/pan_device.h \ - encoder/pan_encoder.h \ - encoder/pan_format.c \ - encoder/pan_invocation.c \ - encoder/pan_pool.c \ - encoder/pan_pool.h \ - encoder/pan_props.c \ - encoder/pan_sampler.c \ - encoder/pan_scoreboard.c \ - encoder/pan_scoreboard.h \ - encoder/pan_tiler.c \ - encoder/pan_texture.c \ - encoder/pan_scratch.c \ - encoder/pan_util.h +lib_FILES := \ + lib/pan_afbc.c \ + lib/pan_attributes.c \ + lib/pan_bo.c \ + lib/pan_bo.h \ + lib/pan_blit.c \ + lib/pan_device.h \ + lib/pan_encoder.h \ + lib/pan_format.c \ + lib/pan_invocation.c \ + lib/pan_pool.c \ + lib/pan_pool.h \ + lib/pan_props.c \ + lib/pan_sampler.c \ + lib/pan_scoreboard.c \ + lib/pan_scoreboard.h \ + lib/pan_tiler.c \ + lib/pan_texture.c \ + lib/pan_scratch.c \ + lib/pan_util.h midgard_FILES := \ midgard/compiler.h \ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
