diff --git a/libs/ui/Android.mk b/libs/ui/Android.mk
index 1ce862652..a8eb67b34 100644
--- a/libs/ui/Android.mk
+++ b/libs/ui/Android.mk
@@ -56,6 +56,10 @@ ifneq ($(BOARD_FRAMEBUFFER_FORCE_FORMAT),)
 LOCAL_CFLAGS += -DFRAMEBUFFER_FORCE_FORMAT=$(BOARD_FRAMEBUFFER_FORCE_FORMAT)
 endif
 
+ifeq ($(BOARD_EGL_NEEDS_HANDLE_VALUE),true)
+LOCAL_CFLAGS += -DEGL_NEEDS_HANDLE
+endif
+
 LOCAL_MODULE := libui
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
index d82393855..992c1fe6b 100644
--- a/libs/ui/GraphicBuffer.cpp
+++ b/libs/ui/GraphicBuffer.cpp
@@ -113,7 +113,7 @@ void GraphicBuffer::free_handle()
         allocator.free(handle);
     }
 
-#ifndef EXYNOS4_ENHANCEMENTS
+#ifndef EGL_NEEDS_HANDLE
     handle = NULL;
 #endif