diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
index 8bda3aaaf..82248470a 100644
--- a/libs/gui/Android.mk
+++ b/libs/gui/Android.mk
@@ -42,6 +42,10 @@ endif
 ifeq ($(TARGET_BOARD_PLATFORM), s5pc110)
 	LOCAL_CFLAGS += -DUSE_FENCE_SYNC
 endif
+ifneq ($(filter generic%,$(TARGET_DEVICE)),)
+    # Emulator build
+    LOCAL_CFLAGS += -DUSE_FENCE_SYNC
+endif
 
 ifeq ($(TARGET_BOARD_PLATFORM), tegra)
 	LOCAL_CFLAGS += -DALLOW_DEQUEUE_CURRENT_BUFFER