From: Mauro Rossi Date: Fri, 27 Oct 2017 19:54:14 +0000 (+0200) Subject: Android: move drivers' symlinks to /vendor (v2) X-Git-Tag: android-x86-8.1-r1~8558 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7dae419aa7c34af820c08896acef3b65d855188e;p=android-x86%2Fexternal-mesa.git Android: move drivers' symlinks to /vendor (v2) Having moved gallium_dri.so library to /vendor/lib/dri also symlinks need to be coherently created using TARGET_OUT_VENDOR instead of TARGET_OUT or all non Intel drivers will not be loaded with Android N and earlier, thus causing SurfaceFlinger SIGABRT (v2) simplification of post install command Fixes: c3f75d483c ("Android: move libraries to /vendor") Cc: 17.3 Reviewed-by: Tapani Pälli (v1) Reviewed-by: Rob Herring (v1) Reviewed-by: Emil Velikov --- diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index e40288c21b9..5a3fda65d46 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -68,8 +68,9 @@ LOCAL_SHARED_LIBRARIES += $(sort $(GALLIUM_SHARED_LIBS)) ifneq ($(filter 5 6 7, $(MESA_ANDROID_MAJOR_VERSION)),) LOCAL_POST_INSTALL_CMD := \ $(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;) \ + $(eval MESA_DRI_MODULE_PATH := $(TARGET_OUT_VENDOR)/$(l)/$(MESA_DRI_MODULE_REL_PATH)) \ + mkdir -p $(MESA_DRI_MODULE_PATH); \ + $(foreach d, $(GALLIUM_TARGET_DRIVERS), ln -sf gallium_dri.so $(MESA_DRI_MODULE_PATH)/$(d)_dri.so;) \ ) else LOCAL_MODULE_SYMLINKS := $(foreach d, $(GALLIUM_TARGET_DRIVERS), $(d)_dri.so)