| Message ID | 20190502180346.4769-4-john.stultz@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | mesa: Initial build fixups for AOSP/master | expand |
Hi John, This patch and the previous one landed with a fixes tag nominating them for the staging/19.0 branch, but they don't apply, and to get the to apply requires pulling in several other android build system patches. If you'd like those in the 19.0 stable branch can you put together an MR against the staging/19.0 branch, or if you don't care let me know so I can mark them as de-nominated? Thanks, Dylan Quoting John Stultz (2019-05-02 11:03:46) > The ir3_nir_trig.py file was moved in a previous commit, > aa0fed10d3574 (freedreno: move ir3 to common location), > so update the Android.gen.mk file to match. > > 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> > Signed-off-by: John Stultz <john.stultz@linaro.org> > --- > src/gallium/drivers/freedreno/Android.gen.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/gallium/drivers/freedreno/Android.gen.mk b/src/gallium/drivers/freedreno/Android.gen.mk > index 17b6fbe1b7e..d29ba159d5c 100644 > --- a/src/gallium/drivers/freedreno/Android.gen.mk > +++ b/src/gallium/drivers/freedreno/Android.gen.mk > @@ -25,7 +25,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES > endif > > ir3_nir_trig_deps := \ > - $(LOCAL_PATH)/ir3/ir3_nir_trig.py \ > + $(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \ > $(MESA_TOP)/src/compiler/nir/nir_algebraic.py > > intermediates := $(call local-generated-sources-dir) > -- > 2.17.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Tue, May 7, 2019 at 11:34 AM Dylan Baker <dylan@pnwbakers.com> wrote: > > This patch and the previous one landed with a fixes tag nominating them for the > staging/19.0 branch, but they don't apply, and to get the to apply requires > pulling in several other android build system patches. If you'd like those in > the 19.0 stable branch can you put together an MR against the staging/19.0 > branch, or if you don't care let me know so I can mark them as de-nominated? > Yea, so this one I don't think is necessary for 19.0 So you can see the patchset I'm pushing at the moment against 19.0.3 for AOSP: https://android-review.googlesource.com/c/platform/external/mesa3d/+/956844 thanks -john
diff --git a/src/gallium/drivers/freedreno/Android.gen.mk b/src/gallium/drivers/freedreno/Android.gen.mk index 17b6fbe1b7e..d29ba159d5c 100644 --- a/src/gallium/drivers/freedreno/Android.gen.mk +++ b/src/gallium/drivers/freedreno/Android.gen.mk @@ -25,7 +25,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES endif ir3_nir_trig_deps := \ - $(LOCAL_PATH)/ir3/ir3_nir_trig.py \ + $(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \ $(MESA_TOP)/src/compiler/nir/nir_algebraic.py intermediates := $(call local-generated-sources-dir)
The ir3_nir_trig.py file was moved in a previous commit, aa0fed10d3574 (freedreno: move ir3 to common location), so update the Android.gen.mk file to match. 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> Signed-off-by: John Stultz <john.stultz@linaro.org> --- src/gallium/drivers/freedreno/Android.gen.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1