Mesa (master): android: libsync is needed on Android 4.2+ for any driver

[Chad Versace]

Module: Mesa
Branch: master
Commit: 5cca6b6280549ce1944a9db55f6cc82ae3ae6f86
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cca6b6280549ce1944a9db55f6cc82ae3ae6f86

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Fri May  3 15:44:10 2013 +0800

android: libsync is needed on Android 4.2+ for any driver

Add libsync not only for MESA_BUILD_CLASSIC, but also for MESA_BUILD_GALLIUM.

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Chad Versace <chad.versace at linux.intel.com>

---

 src/egl/main/Android.mk |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk
index b2cbe05..30e5ea7 100644
--- a/src/egl/main/Android.mk
+++ b/src/egl/main/Android.mk
@@ -68,6 +68,9 @@ LOCAL_SHARED_LIBRARIES := \
 	libcutils \
 	libgralloc_drm \
 
+ifeq ($(shell echo "$(MESA_ANDROID_VERSION) >= 4.2" | bc),1)
+LOCAL_SHARED_LIBRARIES += libsync
+endif
 
 # add libdrm if there are hardware drivers
 ifneq ($(MESA_GPU_DRIVERS),swrast)
@@ -81,11 +84,6 @@ LOCAL_STATIC_LIBRARIES += libmesa_egl_dri2
 # require i915_dri and/or i965_dri
 LOCAL_REQUIRED_MODULES += \
 	$(addsuffix _dri, $(filter i915 i965, $(MESA_GPU_DRIVERS)))
-
-ifeq ($(shell echo "$(MESA_ANDROID_VERSION) >= 4.2" | bc),1)
-    LOCAL_SHARED_LIBRARIES += \
-        libsync
-endif
 endif # MESA_BUILD_CLASSIC
 
 ifeq ($(strip $(MESA_BUILD_GALLIUM)),true)