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 4f02fc7..b866293 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -83,6 +83,13 @@
-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