diff options
| author | Mauro Rossi <[email protected]> | 2017-06-30 08:54:34 +0200 |
|---|---|---|
| committer | Rob Herring <[email protected]> | 2017-06-30 11:23:51 -0500 |
| commit | 84690d06c15dcf638f393af73a939722ee88e5ff (patch) | |
| tree | ebf782cbccaea1fb2df5b3c914d0262020664169 | |
| parent | 0782350b80dc8dc7e70d7fc67ea365b1999eb88a (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index f16391daa4c..96b570ea116 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 |