Mesa (master): Android: fix typo in symlink for driver loading and 32 bit builds

[Rob Herring]

Module: Mesa
Branch: master
Commit: 84690d06c15dcf638f393af73a939722ee88e5ff
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=84690d06c15dcf638f393af73a939722ee88e5ff

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Fri Jun 30 08:54:34 2017 +0200

Android: fix typo in symlink for driver loading and 32 bit builds

There is typo in the mkdir command path,
the correct one is $(TARGET_OUT)/$(l)/$(MESA_DRI_MODULE_REL_PATH)

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.

Fixes: a3d98ca62f ("Android: use symlinks for driver loading")

Signed-off-by: Rob Herring <robh at kernel.org>

---

 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 f16391daa4..96b570ea11 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -60,8 +60,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