[Mesa-dev] [PATCH] android: fix a build issue with libmesa_st_mesa_32

[Emil Velikov]

On 7 September 2016 at 13:10, Mauro Rossi <issor.oruam at gmail.com> wrote:
> 2016-09-07 12:56 GMT+02:00 Emil Velikov <emil.l.velikov at gmail.com>:
>>
>> On 7 September 2016 at 11:01, Mauro Rossi <issor.oruam at gmail.com> wrote:
>> > Hi Tapani,
>> >
>> > does moving the declaration of the dependency to
>> > src/mesa/drivers/dri/i965/Android.mk also work?
>> > Mauro
>> >
>> > LOCAL_WHOLE_STATIC_LIBRARIES := \
>> > $(MESA_DRI_WHOLE_STATIC_LIBRARIES) \
>> > + libmesa_genxml \
>> > libmesa_isl
>> >
>> >
>> Mauro, it's very unlikely that this will work. Afaict the static lib
>> is required to pull the generated XML headers into the generated C
>> file.
>>
>> Adding libmesa_genxml to LOCAL_WHOLE_STATIC_LIBRARIES will move the
>> dependency (and thus generation) of the said headers to the (final)
>> link stage. At which point all the files are (should be) compiled.
>>
>> Tapani, please send a patch with your fix with a line worth of commit
>> message (feel free to copy mine you want) ? Feel free to add
>> Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
>
>
> Just a final check, minor aesthetics,
>
> should the libmesa_genxml static library dependency be declared in
> src/mesa/drivers/dri/i965/Android.mk
> instead of doing it src/mesa/drivers/dri/i965/Android.gen.mk, which sole
> purpose is to generate sources?
>
I see your point, but sadly the Android behaviour of
LOCAL_GENERATED_SOURCES is different from autoconf. Thus I'm leaning
towards Android.gen.mk.
Namely: on Android anything you add to the variable gets
_automatically_ added into the build of the current binary, while in
autoconf land you _explicitly_ add it.

Since its automatically pulled, one ought to keep the dependency
alongside. I'm not 100% sold which one is be better, so I'll leave it
to Tapani to decide - keep it as-is or move the line into the i965_dri
section of Android.mk.

-Emil