From 5cca6b6280549ce1944a9db55f6cc82ae3ae6f86 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olvaffe@gmail.com>
Date: Fri, 3 May 2013 15:44:10 +0800
Subject: [PATCH] android: libsync is needed on Android 4.2+ for any driver
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
---
 src/egl/main/Android.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk
index b2cbe05ff1c..30e5ea7d860 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)
-- 
2.30.2