summaryrefslogtreecommitdiffstats
path: root/src/egl/main/Android.mk
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2012-12-20 14:16:50 -0800
committerChad Versace <[email protected]>2013-01-02 14:55:36 -0800
commitbfe28b8d938c4082e9334e4ccaf423fcd1625154 (patch)
tree4ef94671c841ddeb0600f506dcfa30dfe5dc2481 /src/egl/main/Android.mk
parent56c6cdc9e71771d0fcdecabbe62d45a36f2d03b4 (diff)
egl/android: Fix build for Jelly Bean (v2)
In Jelly Bean, the interface to ANativeWindow changed. The change included adding a new parameter the queueBuffer and dequeueBuffer methods, removing the lockBuffer method, and requiring libsync. v2: - s/fence_fd == -1/fence_fd != -1/ - Fix leak. Close the fence_fd. Reviewed-by: Tapani Pälli <[email protected]> Signed-off-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/egl/main/Android.mk')
-rw-r--r--src/egl/main/Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/egl/main/Android.mk b/src/egl/main/Android.mk
index a4a00f3bb35..97e4860211a 100644
--- a/src/egl/main/Android.mk
+++ b/src/egl/main/Android.mk
@@ -79,7 +79,12 @@ 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)