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 | |
| parent | 0663edf85b8e055dfecf290afab1a15c68da961a (diff) | |
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>
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | src/egl/Android.mk | 6 | ||||
| -rw-r--r-- | src/gallium/targets/dri/Android.mk | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Android.mk | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/Android.mk | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 2 |
6 files changed, 11 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk index 2c56b73dff..67d894f2af 100644 --- a/Android.mk +++ b/Android.mk @@ -42,6 +42,10 @@ $(call local-intermediates-dir) endef endif +MESA_DRI_MODULE_REL_PATH := dri +MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/$(MESA_DRI_MODULE_REL_PATH) +MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/$(MESA_DRI_MODULE_REL_PATH) + MESA_COMMON_MK := $(MESA_TOP)/Android.common.mk MESA_PYTHON2 := python diff --git a/src/egl/Android.mk b/src/egl/Android.mk index cf7125145c..51a9202d9c 100644 --- a/src/egl/Android.mk +++ b/src/egl/Android.mk @@ -44,10 +44,10 @@ LOCAL_CFLAGS := \ -DHAVE_ANDROID_PLATFORM ifeq ($(MESA_LOLLIPOP_BUILD),true) -LOCAL_CFLAGS_32 := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\" -LOCAL_CFLAGS_64 := -DDEFAULT_DRIVER_DIR=\"/system/lib64/dri\" +LOCAL_CFLAGS_32 := -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\" +LOCAL_CFLAGS_64 := -DDEFAULT_DRIVER_DIR=\"/system/lib64/$(MESA_DRI_MODULE_REL_PATH)\" else -LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\" +LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/$(MESA_DRI_MODULE_REL_PATH)\" endif LOCAL_C_INCLUDES := \ diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk index 4acd093f78..7da0e8aabb 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 diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk index 1789762663..7e7587b075 100644 --- a/src/mesa/drivers/dri/Android.mk +++ b/src/mesa/drivers/dri/Android.mk @@ -28,9 +28,6 @@ include $(LOCAL_PATH)/common/Makefile.sources #----------------------------------------------- # Variables common to all DRI drivers -MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri -MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri - MESA_DRI_CFLAGS := \ -DHAVE_ANDROID_PLATFORM diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk index b95d5c1a3a..97359fa049 100644 --- a/src/mesa/drivers/dri/i915/Android.mk +++ b/src/mesa/drivers/dri/i915/Android.mk @@ -27,7 +27,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := i915_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) diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 4f2e6dbca1..056b223f2d 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -27,7 +27,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := i965_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) |