summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2013-05-03 15:44:10 +0800
committerChad Versace <[email protected]>2013-05-06 07:20:08 -0700
commit5cca6b6280549ce1944a9db55f6cc82ae3ae6f86 (patch)
treeddba5a5c645115f1ff3e3e7c903642ee6bf01868
parentda109d56d5df8b3188d8cf18ef42343793a9dbf8 (diff)
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 <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Reviewed-by: Chad Versace <[email protected]>
-rw-r--r--src/egl/main/Android.mk8
1 files 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)