diff options
| author | Rob Herring <robh@kernel.org> | 2016-02-24 12:56:28 -0600 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-02-29 10:51:44 +0000 |
| commit | 8949edf01863ade9c87a02e1256bba083f14317a (patch) | |
| tree | 2f084b9cb997adce468263fd8af17960859fa8f5 /src/gallium/targets/dri/Android.mk | |
| parent | 0663edf85b8e055dfecf290afab1a15c68da961a (diff) | |
| download | external_mesa3d-8949edf01863ade9c87a02e1256bba083f14317a.zip external_mesa3d-8949edf01863ade9c87a02e1256bba083f14317a.tar.gz external_mesa3d-8949edf01863ade9c87a02e1256bba083f14317a.tar.bz2 | |
Android: clean-up and fix DRI module path handling
MESA_DRI_MODULE_PATH is only getting set for classic DRI drivers and may or
may not be set correctly for gallium_dri.so depending on the makefile
include ordering. For Android 6 and earlier it is fine, but with build
system changes in AOSP master, it is not.
Move the path variables to a single place at the top level and introduce
MESA_DRI_MODULE_REL_PATH for Android 5 and later which require relative
paths. With this, there is a single variable to change.
Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/gallium/targets/dri/Android.mk')
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 4acd093..7da0e8a 100644 --- a/src/gallium/targets/dri/Android.mk +++ b/src/gallium/targets/dri/Android.mk @@ -28,9 +28,10 @@ include $(CLEAR_VARS) LOCAL_MODULE := gallium_dri ifeq ($(MESA_LOLLIPOP_BUILD),true) -LOCAL_MODULE_RELATIVE_PATH := $(notdir $(MESA_DRI_MODULE_PATH)) +LOCAL_MODULE_RELATIVE_PATH := $(MESA_DRI_MODULE_REL_PATH) else LOCAL_MODULE_PATH := $(MESA_DRI_MODULE_PATH) +LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH) endif LOCAL_SRC_FILES := target.c |