[Mesa-dev] [PATCH] android, autotools: st/mesa: fix location of float64_glsl.h

[Jordan Justen]

On 2019-03-04 15:21:26, Mauro Rossi wrote:
> Hi,
> On Mon, Mar 4, 2019 at 7:50 PM Mauro Rossi <issor.oruam at gmail.com> wrote:
> >
> > Il lun 4 mar 2019, 18:59 Dylan Baker <dylan at pnwbakers.com> ha scritto:
> >>
> >> I wrote c812, and I'd be very happy to revert it. The problem that I ran into
> >> was putting it in a place that android, meson, and the autotools dist tarball
> >> were happy with. I'm hoping that we can remove autotools in the very near future
> >> and just revert c812 at that time. Does that seem like a reasonable solution?
> >>
> >> Dylan
> 
> Hi Dylan,
> I have checked on Android.mk and reverting you commit c812c740e6
> would be very complex.
> 
> The best way is to proceed now is with my patch to un-break the Android build
> 
> Then as a reference, the future solution may require chages to sources:
> 
> #include "compiler/glsl/{header}.h"
> to become
> #include "glsl/{header}.h"
> 
> in order to reach the Android generated files with
>  $(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,)
> as equivalent of -I$(top_builddir)/src/compiler

Just wanted to point out that Jason is moving this under glsl in:

https://gitlab.freedesktop.org/mesa/mesa/merge_requests/371

So, either that will fix this, or else cause it to break in a new,
different way. :)

-Jordan