scons: rework the EGL build

[mesa.git] / src / egl / drivers / dri2 / Android.mk

diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk
index 679cc2e5cca56ea7d8eebdcd548300696ca8ada6..76be3b246ba70e362acade686f6586e496e36c39 100644 (file)
--- a/src/egl/drivers/dri2/Android.mk
+++ b/src/egl/drivers/dri2/Android.mk
@@ -32,19 +32,30 @@ LOCAL_SRC_FILES := \
        platform_android.c
 
 LOCAL_CFLAGS := \
-       -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\" \
-       -DHAVE_SHARED_GLAPI \
        -DHAVE_ANDROID_PLATFORM
 
+ifeq ($(MESA_LOLLIPOP_BUILD),true)
+LOCAL_CFLAGS_arm := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
+LOCAL_CFLAGS_x86 := -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
+LOCAL_CFLAGS_x86_64 := -DDEFAULT_DRIVER_DIR=\"/system/lib64/dri\"
+else
+LOCAL_CFLAGS += -DDEFAULT_DRIVER_DIR=\"/system/lib/dri\"
+endif
+
 LOCAL_C_INCLUDES := \
        $(MESA_TOP)/src/mapi \
        $(MESA_TOP)/src/egl/main \
-       $(MESA_TOP)/src/loader \
-       $(TARGET_OUT_HEADERS)/libdrm \
        $(DRM_GRALLOC_TOP)
 
 LOCAL_STATIC_LIBRARIES := \
-       libloader
+       libmesa_loader
+
+LOCAL_SHARED_LIBRARIES := libdrm
+
+ifeq ($(shell echo "$(MESA_ANDROID_VERSION) >= 4.2" | bc),1)
+LOCAL_SHARED_LIBRARIES += \
+       libsync
+endif
 
 LOCAL_MODULE := libmesa_egl_dri2