Skip to content
This repository was archived by the owner on Jan 7, 2023. It is now read-only.

Commit f47405f

Browse files
Alistair Strachanstrassek
authored andcommitted
UPSTREAM: mesa: android: Remove unnecessary dependency tracking rules
The current AOSP master build system breaks building mesa due to the following error: external/mesa3d/src/compiler/Android.glsl.gen.mk:94: error: writing to readonly directory: "external/mesa3d/src/compiler/glsl/ir.h" This error is bogus -- nothing "writes" to ir.h -- but the rule is unnecessary because the generated header that is a dependency of the non-generated header should be added to LOCAL_GENERATED_SOURCES and this will track if the dependency needs to be regenerated. (This change fixes a similar problem affecting nir.h too.) Cc: Rob Clark <[email protected]> Cc: Emil Velikov <[email protected]> Cc: Amit Pundir <[email protected]> Cc: Sumit Semwal <[email protected]> Cc: Alistair Strachan <[email protected]> Cc: Greg Hartman <[email protected]> Cc: Tapani Pälli <[email protected]> Cc: Jason Ekstrand <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Signed-off-by: Alistair Strachan <[email protected]> [jstultz: Forward ported and tweaked commit subject] Signed-off-by: John Stultz <[email protected]> (cherry picked from commit 0fda3ea)
1 parent 775d4f1 commit f47405f

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

src/compiler/Android.glsl.gen.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ $(intermediates)/glsl/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-lex.l
9090
$(intermediates)/glsl/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-parse.y
9191
$(call glsl_local-y-to-c-and-h)
9292

93-
$(LOCAL_PATH)/glsl/ir.h: $(intermediates)/glsl/ir_expression_operation.h
94-
9593
$(intermediates)/glsl/ir_expression_operation.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py
9694
@mkdir -p $(dir $@)
9795
$(hide) $(MESA_PYTHON2) $< enum > $@

src/compiler/Android.nir.gen.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ $(intermediates)/nir/nir_opcodes.h: $(nir_opcodes_h_deps)
7676
@mkdir -p $(dir $@)
7777
$(hide) $(MESA_PYTHON2) $(nir_opcodes_h_gen) $< > $@
7878

79-
$(LOCAL_PATH)/nir/nir.h: $(intermediates)/nir/nir_opcodes.h
80-
8179
nir_opcodes_c_gen := $(LOCAL_PATH)/nir/nir_opcodes_c.py
8280
nir_opcodes_c_deps := \
8381
$(LOCAL_PATH)/nir/nir_opcodes.py \

0 commit comments

Comments
 (0)