[Mesa-dev] [PATCH] Android: fix typo in symlink for driver loading and 32 bit builds

[Rob Herring]

On Fri, Jun 30, 2017 at 1:54 AM, Mauro Rossi <issor.oruam at gmail.com> wrote:
> There is typo in the mkdir command path,
> the correct one is $(TARGET_OUT)/$(l)/$(MESA_DRI_MODULE_REL_PATH)

Humm, I tested the the pre-O case by enabling it on master and thought
it worked. Maybe TARGET_OUT_SHARED_LIBRARIES didn't exist pre-O?

> The other issue is in 32bit builds, because lib64 does not exist there,
> we can use TARGET_IS_64_BIT to refine the post install command.

I was aware of this, but broken symlinks don't really hurt anything.
The fix is fine though.

> Fixes: a3d98ca62f ("Android: use symlinks for driver loading")
> ---
>  src/gallium/targets/dri/Android.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
> index 41d597b639..29919c2d61 100644
> --- a/src/gallium/targets/dri/Android.mk
> +++ b/src/gallium/targets/dri/Android.mk
> @@ -61,8 +61,8 @@ LOCAL_SHARED_LIBRARIES += $(sort $(GALLIUM_SHARED_LIBS))
>
>  ifneq ($(filter 5 6 7, $(MESA_ANDROID_MAJOR_VERSION)),)
>  LOCAL_POST_INSTALL_CMD := \
> -       $(foreach l, lib lib64, \
> -         mkdir -p $(TARGET_OUT_SHARED_LIBRARIES)/$(l)/$(MESA_DRI_MODULE_REL_PATH); \
> +       $(foreach l, lib $(if $(filter true,$(TARGET_IS_64_BIT)),lib64), \
> +         mkdir -p $(TARGET_OUT)/$(l)/$(MESA_DRI_MODULE_REL_PATH); \
>           $(foreach d, $(GALLIUM_TARGET_DRIVERS), ln -sf gallium_dri.so $(TARGET_OUT)/$(l)/$(MESA_DRI_MODULE_REL_PATH)/$(d)_dri.so;) \
>         )
>  else
> --
> 2.11.0
>