Move the defining of DEFAULT_DRIVER_DIR path to a common location so both
EGL and GBM can use it.
Signed-off-by: Rob Herring <r...@kernel.org>
---
v2:
- new patch
Android.common.mk | 7 +++++++
src/egl/Android.mk | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Android.common.mk b/Android.common.mk
index e6ff55f..a0e48a5 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -84,6 +84,13 @@ LOCAL_CPPFLAGS += \
-Wno-error=non-virtual-dtor \
-Wno-non-virtual-dtor
+ifeq ($(MESA_LOLLIPOP_BUILD),true)
+ 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/$(MESA_DRI_MODULE_REL_PATH)\"
+endif
+
# uncomment to keep the debug symbols
#LOCAL_STRIP_MODULE := false
diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 51a9202..5dce6c6 100644
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -43,13 +43,6 @@ LOCAL_CFLAGS := \
-D_EGL_BUILT_IN_DRIVER_DRI2 \
-DHAVE_ANDROID_PLATFORM
-ifeq ($(MESA_LOLLIPOP_BUILD),true)
-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/$(MESA_DRI_MODULE_REL_PATH)\"
-endif
-
LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/egl/main \
$(MESA_TOP)/src/egl/drivers/dri2 \
--
2.7.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
