search

intel / external-mesa

16 stars 57 forks source link

[DO NOT MERGE]UPSTREAM: mesa: android: Remove unnecessary dependency … #123

Closed renchenglei closed 5 years ago

renchenglei commented 5 years ago

…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 robdclark@chromium.org Cc: Emil Velikov emil.l.velikov@gmail.com Cc: Amit Pundir amit.pundir@linaro.org Cc: Sumit Semwal sumit.semwal@linaro.org Cc: Alistair Strachan astrachan@google.com Cc: Greg Hartman ghartman@google.com Cc: Tapani Pälli tapani.palli@intel.com Cc: Jason Ekstrand jason@jlekstrand.net Reviewed-by: Tapani Pälli tapani.palli@intel.com Reviewed-by: Emil Velikov emil.velikov@collabora.com Signed-off-by: Alistair Strachan astrachan@google.com [jstultz: Forward ported and tweaked commit subject] Signed-off-by: John Stultz john.stultz@linaro.org (cherry picked from commit 0fda3eac3164dabdd85292e9a64d269b4fee3f4b) Tracked-On:https://jira.devtools.intel.com/browse/OAM-82958 Change-Id: Ia25250193f7dfbd3f353b3b927d9d09b437a38f9 Reviewed-on: https://android.intel.com:443/672759

jennycao commented 5 years ago

@strassek @renchenglei would you help to merge this patch ? the build of mesa master branch are failed without this patch.

strassek commented 5 years ago

Merged and pushed to master, thanks!