summaryrefslogtreecommitdiff
path: root/Android.common.mk
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2016-05-03 21:02:39 -0500
committerEmil Velikov <emil.l.velikov@gmail.com>2016-05-23 12:07:45 +0100
commitfc1806e041b4ce93ab9b5710164bf96d725437ba (patch)
treedda933410cf1eb790e1ea6f85d99bddc6195a9ba /Android.common.mk
parent6ce11e7e2c6be033e0d712fc39359de7b955c2bf (diff)
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>
Diffstat (limited to 'Android.common.mk')
-rw-r--r--Android.common.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk
index 4f02fc7371e..b866293b18e 100644
--- 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