From 90d3d32fc8c46f875923d365e094c4d2fe6c08a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20D=C3=ADaz?= Date: Tue, 6 Oct 2015 23:58:07 -0500 Subject: tests: Use only explicit rules on Android.mk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An implicit (pattern) and an explicit (normal) rule ended up on one of the targets. While gmake has made that a non-fatal error on the most recent versions, kati (from Ninja) does not like it at all. In this case, it was the LOCAL_GENERATED_SOURCES which included a list of headers (a pattern in the form of %.h). Change-Id: If2aa9f829f59c931dc25cd1ed910677c00f68bba Signed-off-by: Daniel Díaz --- tests/util/Android.mk | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/tests/util/Android.mk b/tests/util/Android.mk index f13c8e95a..1e1a51555 100644 --- a/tests/util/Android.mk +++ b/tests/util/Android.mk @@ -61,7 +61,36 @@ LOCAL_GENERATED_SOURCES += $(CONFIG_HEADER) intermediates:= $(local-generated-sources-dir) GEN_PIGLIT_DISPATCH_DIR := $(LOCAL_PATH) GEN_DISPATCH := $(GEN_PIGLIT_DISPATCH_DIR)/%.h $(GEN_PIGLIT_DISPATCH_DIR)/%.c -GEN_HEADER := $(GEN_PIGLIT_DISPATCH_DIR)/%.h +LOCAL_HEADER_FILES := $(addprefix $(GEN_PIGLIT_DISPATCH_DIR)/, \ + glxew.h \ + minmax-test.h \ + piglit-dispatch.h \ + piglit-fbo.h \ + piglit-framework-cl-api.h \ + piglit-framework-cl-custom.h \ + piglit-framework-cl.h \ + piglit-framework-cl-program.h \ + piglit-framework-gl.h \ + piglit-glx-util.h \ + piglit_ktx.h \ + piglit-log.h \ + piglit-matrix.h \ + piglit-shader.h \ + piglit-test-pattern.h \ + piglit-util-cl-enum.h \ + piglit-util-cl.h \ + piglit-util-compressed-grays.h \ + piglit-util-egl.h \ + piglit-util-gl.h \ + piglit-util.h \ + piglit-util-waffle.h \ + piglit-vbo.h \ + r11g11b10f.h \ + rgb9e5.h \ + sized-internalformats.h \ + ) + +GEN_HEADER := $(LOCAL_HEADER_FILES) $(GEN_DISPATCH): PRIVATE_CUSTOM_TOOL = python $+ --out-dir $(GEN_PIGLIT_DISPATCH_DIR) $(GEN_DISPATCH): $(LOCAL_PATH)/gen_dispatch.py $(transform-generated-source) -- cgit v1.2.3