Android: fix typo in symlink for driver loading and 32 bit builds
authorMauro Rossi <issor.oruam@gmail.com>
Fri, 30 Jun 2017 06:54:34 +0000 (08:54 +0200)
committerRob Herring <robh@kernel.org>
Fri, 30 Jun 2017 16:23:51 +0000 (11:23 -0500)
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@kernel.org>
src/gallium/targets/dri/Android.mk

index f16391daa4c0435e148ef62e0d64c6d57a2723e8..96b570ea11628bb2ba31bc4c897d449174911003 100644 (file)
@@ -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