diff options
| author | Rob Herring <robh@kernel.org> | 2016-05-03 21:02:39 -0500 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-23 12:07:45 +0100 |
| commit | fc1806e041b4ce93ab9b5710164bf96d725437ba (patch) | |
| tree | dda933410cf1eb790e1ea6f85d99bddc6195a9ba | |
| parent | 6ce11e7e2c6be033e0d712fc39359de7b955c2bf (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>
| -rw-r--r-- | Android.common.mk | 7 | ||||
| -rw-r--r-- | src/egl/Android.mk | 7 |
2 files changed, 7 insertions, 7 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 diff --git a/src/egl/Android.mk b/src/egl/Android.mk index 51a9202d9cb..5dce6c61559 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 \ |