Android: Move setting DEFAULT_DRIVER_DIR to shared location

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 <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/Android.common.mk b/Android.common.mk
index 4f02fc7371e33126f4470dbd322abcb52b5b3c71..b866293b18e3a6e7669d525830572396dff24223 100644 (file)
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -83,6 +83,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 51a9202d9cb8e68508aee07b2b0c31e9b7f246f6..5dce6c615597453a020478b28c2058124ed4f41f 100644 (file)
--- 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 \