From a648aea3fdf5c3988063701a0d13caff911b8de1 Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 26 Sep 2020 21:03:11 +0200 Subject: [PATCH] android: gallium/iris: cleanup iris_driinfo.h gen rules Android.mk and Makefile.sources are still defining iris_driinfo.h target This patch removes the remaining gen rules Fixes the following building error: FAILED: out/target/product/x86_64/obj/STATIC_LIBRARIES/libmesa_pipe_iris_intermediates/iris/iris_driinfo.h ... cp: bad 'out/target/product/x86_64/gen/STATIC_LIBRARIES/libmesa_pipe_iris_intermediates/iris/iris_driinfo.h': No such file or directory Fixes: 974981c4e6b9 ("gallium/drm: Make the pipe loader handle the driconf merging.") Signed-off-by: Mauro Rossi Reviewed-by: Lionel Landwerlin Part-of: --- src/gallium/drivers/iris/Android.mk | 7 ------- src/gallium/drivers/iris/Makefile.sources | 4 ---- 2 files changed, 11 deletions(-) diff --git a/src/gallium/drivers/iris/Android.mk b/src/gallium/drivers/iris/Android.mk index e3f86b71677..0281b3bc74b 100644 --- a/src/gallium/drivers/iris/Android.mk +++ b/src/gallium/drivers/iris/Android.mk @@ -145,13 +145,6 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libmesa_pipe_iris -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -intermediates := $(call local-generated-sources-dir) - -LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/iris/,$(GENERATED_SOURCES)) - -LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_SRC_FILES := \ $(IRIS_C_SOURCES) diff --git a/src/gallium/drivers/iris/Makefile.sources b/src/gallium/drivers/iris/Makefile.sources index fa5fa840870..343dae67620 100644 --- a/src/gallium/drivers/iris/Makefile.sources +++ b/src/gallium/drivers/iris/Makefile.sources @@ -20,11 +20,7 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -GENERATED_SOURCES := \ - iris_driinfo.h - IRIS_C_SOURCES = \ - $(GENERATED_SOURCES) \ driinfo_iris.h \ iris_batch.c \ iris_batch.h \