Merge ~morphis/libhybris/+git/libhybris-ubuntu:wip into ~libhybris-maintainers/libhybris/+git/libhybris:master

[Simon Fels]

Merge with a more recent upstream version and rebase all our changes. This also includes changes needed in the compat layer to add Android 5.x support.

[Simon Fels (morphis)]

LGTM but waiting until package is released to overlay ppa before merging

[Simon Fels (morphis)]

review: Approve

[Alex Tu (alextu)]

~morphis/libhybris/+git/libhybris-ubuntu:wip gets a build failure which caused by building test_audio binary.

[Alex Tu (alextu)]

revise my latest comment:
Because of this MP is target to android 4.4.2 for merging all changes in github upstream.
So, it can build passed with android 4.4.2 headers[1].

And what I did is to build it with android 5, that's not the target of this MP, so please ignore my last comment for build error.

Detail information about this task : https://wiki.canonical.com/PES/Engineering/Premium/PhoneArticles/LibhybrisRelated

[1] https://launchpad.net/ubuntu/+source/android-headers

diff --git a/.gitignore b/.gitignore
index 1a947ad..ac54812 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,9 +28,42 @@ stamp-h1
 aclocal-copy
 arm-*-linux-gnueabi-libtool
 
+# Generated .pc, .h and .c files
+hybris/camera/libcamera.pc
+hybris/documentation.list
+hybris/egl/egl.pc
+hybris/egl/platforms/common/hybris-egl-platform.pc
+hybris/egl/platforms/common/wayland-android-client-protocol.h
+hybris/egl/platforms/common/wayland-android-protocol.c
+hybris/egl/platforms/common/wayland-android-server-protocol.h
+hybris/egl/platforms/common/wayland-egl.pc
+hybris/egl/platforms/hwcomposer/hwcomposer-egl.pc
+hybris/glesv1/glesv1_cm.pc
+hybris/glesv2/glesv2.pc
+hybris/hardware/libhardware.pc
+hybris/input/libis.pc
+hybris/libnfc_ndef_nxp/libnfc_ndef_nxp.pc
+hybris/libnfc_nxp/libnfc_nxp.pc
+hybris/libsync/libsync.pc
+hybris/properties/libandroid-properties.pc
+hybris/sf/libsf.pc
+hybris/vibrator/libvibrator.pc
+
+# Util binaries
+hybris/utils/getprop
+hybris/utils/setprop
+
+# Test binaries
+hybris/tests/test_camera
+hybris/tests/test_egl_configs
+hybris/tests/test_gps
+hybris/tests/test_input
+hybris/tests/test_nfc
+hybris/tests/test_sf
 hybris/tests/test_egl
 hybris/tests/test_glesv2
 hybris/tests/test_lights
 hybris/tests/test_offscreen_rendering
 hybris/tests/test_sensors
 hybris/tests/test_ui
+
diff --git a/compat/camera/camera_compatibility_layer.cpp b/compat/camera/camera_compatibility_layer.cpp
index 55cd79e..3d8e5bc 100644
--- a/compat/camera/camera_compatibility_layer.cpp
+++ b/compat/camera/camera_compatibility_layer.cpp
@@ -35,6 +35,9 @@
 #else
 #include <gui/GLConsumer.h>
 #endif
+#if ANDROID_VERSION_MAJOR==5
+#include <gui/IGraphicBufferProducer.h>
+#endif
 #include <ui/GraphicBuffer.h>
 
 #include <GLES2/gl2.h>
@@ -53,7 +56,11 @@
 #define REPORT_FUNCTION() ALOGV("%s \n", __PRETTY_FUNCTION__)
 
 // From android::GLConsumer::FrameAvailableListener
-void CameraControl::onFrameAvailable()
+#if ANDROID_VERSION_MAJOR==5 && ANDROID_VERSION_MINOR>=1
+  void CameraControl::onFrameAvailable(const android::BufferItem& item)
+#else
+  void CameraControl::onFrameAvailable()
+#endif
 {
 	REPORT_FUNCTION();
 	if (listener)
@@ -185,7 +192,7 @@ CameraControl* android_camera_connect_to(CameraType camera_type, CameraControlLi
 
 	CameraControl* cc = new CameraControl();
 	cc->listener = listener;
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR>=3
+#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR>=3 || ANDROID_VERSION_MAJOR==5
 	cc->camera = android::Camera::connect(camera_id, android::String16("hybris"), android::Camera::USE_CALLING_UID);
 #else
 	cc->camera = android::Camera::connect(camera_id);
@@ -651,6 +658,11 @@ void android_camera_set_preview_texture(CameraControl* control, int texture_id)
 			new android::NativeBufferAlloc()
 			);
 
+#if ANDROID_VERSION_MAJOR==5
+	android::sp<android::IGraphicBufferProducer> producer;
+	android::sp<android::IGraphicBufferConsumer> consumer;
+	android::BufferQueue::createBufferQueue(&producer, &consumer);
+#else
 	android::sp<android::BufferQueue> buffer_queue(
 #if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
 			new android::BufferQueue(false, NULL, native_alloc)
@@ -658,6 +670,7 @@ void android_camera_set_preview_texture(CameraControl* control, int texture_id)
 			new android::BufferQueue(NULL)
 #endif
 			);
+#endif
 
 	if (control->preview_texture == NULL) {
 #if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
@@ -667,7 +680,13 @@ void android_camera_set_preview_texture(CameraControl* control, int texture_id)
 		control->preview_texture = android::sp<android::GLConsumer>(
 				new android::GLConsumer(
 #endif
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
+#if ANDROID_VERSION_MAJOR==5
+					consumer,
+					texture_id,
+					GL_TEXTURE_EXTERNAL_OES,
+					true,
+					is_controlled_by_app));
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
 					texture_id,
 					allow_synchronous_mode,
 					GL_TEXTURE_EXTERNAL_OES,
@@ -688,7 +707,10 @@ void android_camera_set_preview_texture(CameraControl* control, int texture_id)
 #else
 			android::sp<android::GLConsumer::FrameAvailableListener>(control));
 #endif
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
+
+#if ANDROID_VERSION_MAJOR==5
+	control->camera->setPreviewTarget(producer);
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
 	control->camera->setPreviewTexture(control->preview_texture->getBufferQueue());
 #else
 	control->camera->setPreviewTarget(buffer_queue);
diff --git a/compat/input/Android.mk b/compat/input/Android.mk
index 813c009..06e732d 100644
--- a/compat/input/Android.mk
+++ b/compat/input/Android.mk
@@ -1,5 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
+include $(LOCAL_PATH)/../Android.common.mk
 
 HYBRIS_PATH := $(LOCAL_PATH)/../../hybris
 
@@ -18,15 +19,26 @@ LOCAL_SHARED_LIBRARIES := \
 	libgui \
 	libandroidfw
 
+LOCAL_C_INCLUDES := \
+	$(HYBRIS_PATH)/include \
+	external/skia/include/core
+
 HAS_LIBINPUTSERVICE := $(shell test $(ANDROID_VERSION_MAJOR) -eq 4 -a $(ANDROID_VERSION_MINOR) -gt 2 && echo true)
 ifeq ($(HAS_LIBINPUTSERVICE),true)
 LOCAL_SHARED_LIBRARIES += libinputservice
+LOCAL_C_INCLUDES += frameworks/base/services/input
 endif
 
-LOCAL_C_INCLUDES := \
-	$(HYBRIS_PATH)/include \
-	external/skia/include/core \
-	frameworks/base/services/input
+HAS_LIBINPUTFLINGER := $(shell test $(ANDROID_VERSION_MAJOR) -eq 5 && echo true)
+ifeq ($(HAS_LIBINPUTFLINGER),true)
+LOCAL_SHARED_LIBRARIES += libinputflinger libinputservice
+LOCAL_C_INCLUDES += \
+	frameworks/base/libs/input \
+	frameworks/native/services
+endif
+
+
+
 
 include $(BUILD_SHARED_LIBRARY)
 
diff --git a/compat/input/input_compatibility_layer.cpp b/compat/input/input_compatibility_layer.cpp
index bf902d9..0e0db21 100644
--- a/compat/input/input_compatibility_layer.cpp
+++ b/compat/input/input_compatibility_layer.cpp
@@ -19,8 +19,14 @@
 
 #include <hybris/input/input_stack_compatibility_layer.h>
 
-#include "InputListener.h"
-#include "InputReader.h"
+#if ANDROID_VERSION_MAJOR<=4
+  #include "InputListener.h"
+  #include "InputReader.h"
+#elif ANDROID_VERSION_MAJOR==5
+  #include "inputflinger/InputListener.h"
+  #include "inputflinger/InputReader.h"
+#endif
+
 #include "PointerController.h"
 #include "SpriteController.h"
 #include <gui/ISurfaceComposer.h>
@@ -48,10 +54,20 @@ public:
 
 	DefaultPointerControllerPolicy()
 	{
+#if ANDROID_VERSION_MAJOR<=4
 		bitmap.setConfig(
 				SkBitmap::kARGB_8888_Config,
 				bitmap_width,
 				bitmap_height);
+#elif ANDROID_VERSION_MAJOR==5
+		SkColorType ct = SkBitmapConfigToColorType(SkBitmap::kARGB_8888_Config);
+		bitmap.setInfo(
+				SkImageInfo::Make(bitmap_width,
+					bitmap_height,
+					ct,
+					SkAlphaType::kPremul_SkAlphaType),
+				0);
+#endif
 		bitmap.allocPixels();
 
 		// Icon for spot touches
@@ -142,7 +158,11 @@ public:
 		mInputDevices = inputDevices;
 	}
 
+#if ANDROID_VERSION_MAJOR<=4
 	virtual android::sp<android::KeyCharacterMap> getKeyboardLayoutOverlay(const android::String8& inputDeviceDescriptor) {
+#elif ANDROID_VERSION_MAJOR==5
+	virtual android::sp<android::KeyCharacterMap> getKeyboardLayoutOverlay(const android::InputDeviceIdentifier& identifier) {
+#endif
 		return NULL;
 	}
 
@@ -150,6 +170,12 @@ public:
 		return android::String8::empty();
 	}
 
+#if ANDROID_VERSION_MAJOR==5
+	virtual android::TouchAffineTransformation getTouchAffineTransformation(const android::String8& inputDeviceDescriptor, int32_t surfaceRotation) {
+		return android::TouchAffineTransformation();
+	}
+#endif
+
 private:
 	android::sp<android::Looper> looper;
 	int default_layer_for_touch_point_visualization;
diff --git a/compat/media/Android.mk b/compat/media/Android.mk
index cd3995c..c73fbc4 100644
--- a/compat/media/Android.mk
+++ b/compat/media/Android.mk
@@ -1,5 +1,6 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
+include $(LOCAL_PATH)/../Android.common.mk
 
 LOCAL_SRC_FILES := \
 	camera_service.cpp
@@ -20,8 +21,15 @@ LOCAL_C_INCLUDES := \
     frameworks/av/services/medialog \
     frameworks/av/services/camera/libcameraservice
 
+IS_ANDROID_5 := $(shell test $(ANDROID_VERSION_MAJOR) -eq 5 && echo true)
+ifeq ($(IS_ANDROID_5),true)
+LOCAL_C_INCLUDES += system/media/camera/include
+endif
+
 LOCAL_MODULE := camera_service
 
+LOCAL_32_BIT_ONLY := true
+
 include $(BUILD_EXECUTABLE)
 
 # -------------------------------------------------
@@ -76,6 +84,11 @@ LOCAL_C_INCLUDES := \
 	system/media/audio_utils/include \
 	frameworks/av/services/camera/libcameraservice
 
+IS_ANDROID_5 := $(shell test $(ANDROID_VERSION_MAJOR) -eq 5 && echo true)
+ifeq ($(IS_ANDROID_5),true)
+LOCAL_C_INCLUDES += frameworks/native/include/media/openmax
+endif
+
 ifeq ($(strip $(MTK_CAMERA_BSP_SUPPORT)),yes)
 LOCAL_C_INCLUDES += $(TOP)/mediatek/kernel/include/linux/vcodec
 LOCAL_SHARED_LIBRARIES += \
@@ -89,6 +102,8 @@ LOCAL_C_INCLUDES+= \
 	$(TOP)/$(MTK_PATH_SOURCE)/frameworks/av/include
 endif
 
+LOCAL_32_BIT_ONLY := true
+
 include $(BUILD_SHARED_LIBRARY)
 
 # -------------------------------------------------
@@ -124,6 +139,8 @@ LOCAL_SHARED_LIBRARIES := \
 	libEGL \
 	libGLESv2
 
+LOCAL_32_BIT_ONLY := true
+
 include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -160,4 +177,6 @@ LOCAL_C_INCLUDES:= \
 LOCAL_MODULE:= codec
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_32_BIT_ONLY := true
+
 include $(BUILD_EXECUTABLE)
diff --git a/compat/media/decoding_service.cpp b/compat/media/decoding_service.cpp
index 3a9a8a4..96c62b0 100644
--- a/compat/media/decoding_service.cpp
+++ b/compat/media/decoding_service.cpp
@@ -195,7 +195,11 @@ status_t DecodingService::getIGraphicBufferConsumer(sp<IGraphicBufferConsumer>* 
     pid_t pid = IPCThreadState::self()->getCallingPid();
     ALOGD("Calling Pid: %d", pid);
 
+#if ANDROID_VERSION_MAJOR==5
+    *gbc = consumer;
+#else
     *gbc = buffer_queue;
+#endif
 
     return OK;
 }
@@ -205,7 +209,11 @@ status_t DecodingService::getIGraphicBufferProducer(sp<IGraphicBufferProducer>* 
     pid_t pid = IPCThreadState::self()->getCallingPid();
     ALOGD("Calling Pid: %d", pid);
 
+#if ANDROID_VERSION_MAJOR==5
+    *gbp = producer;
+#else
     *gbp = buffer_queue;
+#endif
     ALOGD("producer(gbp): %p", (void*)gbp->get());
     return OK;
 }
@@ -235,7 +243,12 @@ status_t DecodingService::unregisterSession()
         session.clear();
         // Reset the BufferQueue instance so that the next created client plays
         // video correctly
+#if ANDROID_VERSION_MAJOR==5
+        producer.clear();
+        consumer.clear();
+#else
         buffer_queue.clear();
+#endif
     }
 
     return OK;
@@ -248,14 +261,20 @@ void DecodingService::createBufferQueue()
     sp<IGraphicBufferAlloc> g_buffer_alloc(new GraphicBufferAlloc());
 
     // This BuferQueue is shared between the client and the service
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
+#if ANDROID_VERSION_MAJOR==5
+    BufferQueue::createBufferQueue(&producer, &consumer);
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
     sp<NativeBufferAlloc> native_alloc(new NativeBufferAlloc());
     buffer_queue = new BufferQueue(false, NULL, native_alloc);
 #else
     buffer_queue = new BufferQueue(NULL);
-#endif
     ALOGD("buffer_queue: %p", (void*)buffer_queue.get());
+#endif
+#if ANDROID_VERSION_MAJOR==5
+    producer->setBufferCount(5);
+#else
     buffer_queue->setBufferCount(5);
+#endif
 }
 
 void DecodingService::binderDied(const wp<IBinder>& who)
diff --git a/compat/media/decoding_service_priv.h b/compat/media/decoding_service_priv.h
index 4e80077..2a7544d 100644
--- a/compat/media/decoding_service_priv.h
+++ b/compat/media/decoding_service_priv.h
@@ -130,7 +130,12 @@ protected:
 
 private:
     static sp<DecodingService> decoding_service;
+#if ANDROID_VERSION_MAJOR==5
+    sp<IGraphicBufferProducer> producer;
+    sp<IGraphicBufferConsumer> consumer;
+#else
     sp<BufferQueue> buffer_queue;
+#endif
     sp<IDecodingServiceSession> session;
     DecodingClientDeathCbHybris client_death_cb;
     void *client_death_context;
diff --git a/compat/media/media_codec_list.cpp b/compat/media/media_codec_list.cpp
index 28a8128..930c4c8 100644
--- a/compat/media/media_codec_list.cpp
+++ b/compat/media/media_codec_list.cpp
@@ -60,13 +60,21 @@ void media_codec_list_get_codec_info_at_id(size_t index)
 const char *media_codec_list_get_codec_name(size_t index)
 {
     REPORT_FUNCTION()
+#if ANDROID_VERSION_MAJOR==5
+    return MediaCodecList::getInstance()->getCodecInfo(index)->getCodecName();
+#else
     return MediaCodecList::getInstance()->getCodecName(index);
+#endif
 }
 
 bool media_codec_list_is_encoder(size_t index)
 {
     REPORT_FUNCTION()
+#if ANDROID_VERSION_MAJOR==5
+    return MediaCodecList::getInstance()->getCodecInfo(index)->isEncoder();
+#else
     return MediaCodecList::getInstance()->isEncoder(index);
+#endif
 }
 
 size_t media_codec_list_get_num_supported_types(size_t index)
@@ -74,12 +82,16 @@ size_t media_codec_list_get_num_supported_types(size_t index)
     REPORT_FUNCTION()
 
     Vector<AString> types;
+#if ANDROID_VERSION_MAJOR==5
+    MediaCodecList::getInstance()->getCodecInfo(index)->getSupportedMimes(&types);
+#else
     status_t err = MediaCodecList::getInstance()->getSupportedTypes(index, &types);
     if (err != OK)
     {
         ALOGE("Failed to get the number of supported codec types (err: %d)", err);
         return 0;
     }
+#endif
     ALOGD("Number of supported codec types: %d", types.size());
 
     return types.size();
@@ -90,7 +102,11 @@ size_t media_codec_list_get_nth_supported_type_len(size_t index, size_t n)
     REPORT_FUNCTION()
 
     Vector<AString> types;
+#if ANDROID_VERSION_MAJOR==5
+    MediaCodecList::getInstance()->getCodecInfo(index)->getSupportedMimes(&types);
+#else
     status_t err = MediaCodecList::getInstance()->getSupportedTypes(index, &types);
+#endif
 
     return types[n].size();
 }
@@ -106,31 +122,48 @@ int media_codec_list_get_nth_supported_type(size_t index, char *type, size_t n)
     }
 
     Vector<AString> types;
+#if ANDROID_VERSION_MAJOR==5
+    MediaCodecList::getInstance()->getCodecInfo(index)->getSupportedMimes(&types);
+#else
     status_t err = MediaCodecList::getInstance()->getSupportedTypes(index, &types);
+#endif
     for (size_t i=0; i<types[n].size(); ++i)
         type[i] = types.itemAt(n).c_str()[i];
 
+#if ANDROID_VERSION_MAJOR==5
+    return OK;
+#else
     return err;
+#endif
 }
 
 static void media_codec_list_get_num_codec_capabilities(size_t index, const char *type, size_t *num_profile_levels, size_t *num_color_formats)
 {
     REPORT_FUNCTION()
 
+#if ANDROID_VERSION_MAJOR==5
+    Vector<MediaCodecInfo::ProfileLevel> profile_levels;
+#else
     Vector<MediaCodecList::ProfileLevel> profile_levels;
+#endif
     Vector<uint32_t> color_formats;
     ALOGD("index: %d, type: '%s'", index, type);
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
+#if ANDROID_VERSION_MAJOR==5
+    MediaCodecList::getInstance()->getCodecInfo(index)->getCapabilitiesFor(type)->getSupportedProfileLevels(&profile_levels);
+    MediaCodecList::getInstance()->getCodecInfo(index)->getCapabilitiesFor(type)->getSupportedColorFormats(&color_formats);
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
     status_t err = MediaCodecList::getInstance()->getCodecCapabilities(index, type, &profile_levels, &color_formats);
 #else
     uint32_t flags;
     status_t err = MediaCodecList::getInstance()->getCodecCapabilities(index, type, &profile_levels, &color_formats, &flags);
 #endif
+#if ANDROID_VERSION_MAJOR<5
     if (err != OK)
     {
         ALOGE("Failed to get the number of supported codec capabilities (err: %d)", err);
         return;
     }
+#endif
 
     if (num_profile_levels != NULL)
     {
@@ -180,43 +213,63 @@ int media_codec_list_get_nth_codec_profile_level(size_t index, const char *type,
         return BAD_VALUE;
     }
 
+#if ANDROID_VERSION_MAJOR==5
+    Vector<MediaCodecInfo::ProfileLevel> profile_levels;
+#else
     Vector<MediaCodecList::ProfileLevel> profile_levels;
+#endif
     Vector<uint32_t> formats;
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
+#if ANDROID_VERSION_MAJOR==5
+    MediaCodecList::getInstance()->getCodecInfo(index)->getCapabilitiesFor(type)->getSupportedProfileLevels(&profile_levels);
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
     status_t err = MediaCodecList::getInstance()->getCodecCapabilities(index, type, &profile_levels, &formats);
 #else
     uint32_t flags;
     status_t err = MediaCodecList::getInstance()->getCodecCapabilities(index, type, &profile_levels, &formats, &flags);
 #endif
+#if ANDROID_VERSION_MAJOR<5
     if (err != OK)
     {
         ALOGE("Failed to get the nth codec profile level (err: %d)", err);
         return 0;
     }
+#endif
 
     pro_level->profile = profile_levels[n].mProfile;
     pro_level->level = profile_levels[n].mLevel;
 
+#if ANDROID_VERSION_MAJOR==5
+    return OK;
+#else
     return err;
+#endif
 }
 
 int media_codec_list_get_codec_color_formats(size_t index, const char *type, uint32_t *color_formats)
 {
     REPORT_FUNCTION()
 
+#if ANDROID_VERSION_MAJOR==5
+    Vector<MediaCodecInfo::ProfileLevel> profile_levels;
+#else
     Vector<MediaCodecList::ProfileLevel> profile_levels;
+#endif
     Vector<uint32_t> formats;
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
+#if ANDROID_VERSION_MAJOR==5
+    MediaCodecList::getInstance()->getCodecInfo(index)->getCapabilitiesFor(type)->getSupportedColorFormats(&formats);
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
     status_t err = MediaCodecList::getInstance()->getCodecCapabilities(index, type, &profile_levels, &formats);
 #else
     uint32_t flags;
     status_t err = MediaCodecList::getInstance()->getCodecCapabilities(index, type, &profile_levels, &formats, &flags);
 #endif
+#if ANDROID_VERSION_MAJOR<5
     if (err != OK)
     {
         ALOGE("Failed to get the number of supported codec types (err: %d)", err);
         return 0;
     }
+#endif
 
     for (size_t i=0; i<formats.size(); ++i)
     {
diff --git a/compat/media/media_compatibility_layer.cpp b/compat/media/media_compatibility_layer.cpp
index 45922e3..bb86e5c 100644
--- a/compat/media/media_compatibility_layer.cpp
+++ b/compat/media/media_compatibility_layer.cpp
@@ -87,7 +87,11 @@ struct FrameAvailableListener : public android::GLConsumer::FrameAvailableListen
 		}
 
 		// From android::GLConsumer/SurfaceTexture::FrameAvailableListener
-		void onFrameAvailable()
+#if ANDROID_VERSION_MAJOR==5 && ANDROID_VERSION_MINOR>=1
+		virtual void onFrameAvailable(const android::BufferItem& item)
+#else
+		virtual void onFrameAvailable()
+#endif
 		{
 			if (set_video_texture_needs_update_cb != NULL)
 				set_video_texture_needs_update_cb(video_texture_needs_update_context);
@@ -238,7 +242,9 @@ struct MediaPlayerWrapper : public android::MediaPlayer
 			source_fd = -1;
 		}
 
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
+#if  ANDROID_VERSION_MAJOR==5
+		android::status_t setVideoSurfaceTexture(android::sp<android::IGraphicBufferProducer> bq, const android::sp<android::GLConsumer> &surfaceTexture)
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
 		android::status_t setVideoSurfaceTexture(const android::sp<android::SurfaceTexture> &surfaceTexture)
 #else
 		android::status_t setVideoSurfaceTexture(android::sp<android::BufferQueue> bq, const android::sp<android::GLConsumer> &surfaceTexture)
@@ -443,7 +449,13 @@ int android_media_set_data_source(MediaPlayerWrapper *mp, const char* url)
 	String16 src(url);
 	if (src.startsWith(String16("http://")) == true) {
 		ALOGD("HTTP source URL detected");
+#if 0 // remarked for future debugging - chunsang
+#if ANDROID_VERSION_MAJOR==5
+		mp->setDataSource(NULL,url, NULL);
+#else
 		mp->setDataSource(url, NULL);
+#endif
+#endif
 	} else {
 		ALOGD("File source URL detected");
 		int fd = open(url, O_RDONLY);
@@ -480,6 +492,11 @@ int android_media_set_preview_texture(MediaPlayerWrapper *mp, int texture_id)
 			new android::NativeBufferAlloc()
 			);
 
+#if ANDROID_VERSION_MAJOR==5
+	android::sp<IGraphicBufferProducer> producer;
+	android::sp<IGraphicBufferConsumer> consumer;
+	BufferQueue::createBufferQueue(&producer, &consumer);
+#else
 	android::sp<android::BufferQueue> buffer_queue(
 #if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
 			new android::BufferQueue(false, NULL, native_alloc)
@@ -487,17 +504,28 @@ int android_media_set_preview_texture(MediaPlayerWrapper *mp, int texture_id)
 			new android::BufferQueue(NULL)
 #endif
 			);
+#endif
 
 	static const bool allow_synchronous_mode = true;
 	// Create a new GLConsumer/SurfaceTexture from the texture_id in synchronous mode (don't wait on all data in the buffer)
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
+#if ANDROID_VERSION_MAJOR==5
+	mp->setVideoSurfaceTexture(producer, android::sp<android::GLConsumer>(
+				new android::GLConsumer(
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
 	mp->setVideoSurfaceTexture(android::sp<android::SurfaceTexture>(
 				new android::SurfaceTexture(
 #else
 	mp->setVideoSurfaceTexture(buffer_queue, android::sp<android::GLConsumer>(
 				new android::GLConsumer(
 #endif
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
+#if ANDROID_VERSION_MAJOR==5
+					consumer,
+					texture_id,
+					GL_TEXTURE_EXTERNAL_OES,
+					true,
+					false)));
+
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
 					texture_id,
 					allow_synchronous_mode,
 					GL_TEXTURE_EXTERNAL_OES,
diff --git a/compat/media/media_recorder_client.cpp b/compat/media/media_recorder_client.cpp
index 717ea1d..896bec8 100644
--- a/compat/media/media_recorder_client.cpp
+++ b/compat/media/media_recorder_client.cpp
@@ -254,6 +254,18 @@ status_t MediaRecorderClient::stop()
     return recorder->stop();
 }
 
+status_t MediaRecorderClient::pause()
+{
+    REPORT_FUNCTION();
+    Mutex::Autolock lock(recorder_lock);
+    if (recorder == NULL) {
+        ALOGE("recorder must not be NULL");
+        return NO_INIT;
+    }
+    return recorder->pause();
+
+}
+
 status_t MediaRecorderClient::reset()
 {
     REPORT_FUNCTION();
diff --git a/compat/media/media_recorder_client.h b/compat/media/media_recorder_client.h
index c9e8635..d5c3eb6 100644
--- a/compat/media/media_recorder_client.h
+++ b/compat/media/media_recorder_client.h
@@ -60,6 +60,7 @@ public:
     virtual status_t getMaxAmplitude(int* max);
     virtual status_t start();
     virtual status_t stop();
+    virtual status_t pause();
     virtual status_t reset();
     virtual status_t init();
     virtual status_t close();
diff --git a/compat/media/surface_texture_client_hybris.cpp b/compat/media/surface_texture_client_hybris.cpp
index cef620f..dfd3138 100644
--- a/compat/media/surface_texture_client_hybris.cpp
+++ b/compat/media/surface_texture_client_hybris.cpp
@@ -68,7 +68,15 @@ _SurfaceTextureClientHybris::_SurfaceTextureClientHybris()
 }
 #endif
 
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR>=4
+#if ANDROID_VERSION_MAJOR==5
+_SurfaceTextureClientHybris::_SurfaceTextureClientHybris(const sp<IGraphicBufferProducer> &st)
+    : Surface::Surface(st, true),
+      refcount(1),
+      ready(false)
+{
+    REPORT_FUNCTION()
+}
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR>=4
 _SurfaceTextureClientHybris::_SurfaceTextureClientHybris(const sp<BufferQueue> &bq)
     : Surface::Surface(bq, true),
       refcount(1),
@@ -210,8 +218,13 @@ SurfaceTextureClientHybris surface_texture_client_create_by_id(unsigned int text
         ALOGE("Cannot create new SurfaceTextureClientHybris, texture id must be > 0.");
         return NULL;
     }
+#if ANDROID_VERSION_MAJOR==5
+    sp<IGraphicBufferProducer> producer;
+    sp<IGraphicBufferConsumer> consumer;
+    BufferQueue::createBufferQueue(&producer, &consumer);
 
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
+    _SurfaceTextureClientHybris *stch(new _SurfaceTextureClientHybris(producer));
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=3
     // Use a new native buffer allocator vs the default one, which means it'll use the proper one
     // that will allow rendering to work with Mir
     sp<NativeBufferAlloc> native_alloc(new NativeBufferAlloc());
@@ -229,7 +242,9 @@ SurfaceTextureClientHybris surface_texture_client_create_by_id(unsigned int text
       stch->surface_texture.clear();
 
     const bool allow_synchronous_mode = true;
-#if ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
+#if ANDROID_VERSION_MAJOR==5
+    stch->surface_texture = new GLConsumer(consumer, texture_id, GL_TEXTURE_EXTERNAL_OES, true, true);
+#elif ANDROID_VERSION_MAJOR==4 && ANDROID_VERSION_MINOR<=2
     stch->surface_texture = new SurfaceTexture(texture_id, allow_synchronous_mode, GL_TEXTURE_EXTERNAL_OES, true, buffer_queue);
     set_surface(stch, stch->surface_texture);
 #else
diff --git a/compat/media/surface_texture_client_hybris_priv.h b/compat/media/surface_texture_client_hybris_priv.h
index f59e841..189dca6 100644
--- a/compat/media/surface_texture_client_hybris_priv.h
+++ b/compat/media/surface_texture_client_hybris_priv.h
@@ -89,7 +89,11 @@ class _GLConsumerHybris : public GLConsumer
         {
         }
 
+#if ANDROID_VERSION_MAJOR==5 && ANDROID_VERSION_MINOR>=1
+		virtual void onFrameAvailable(const android::BufferItem& item)
+#else
         virtual void onFrameAvailable()
+#endif
         {
             if (frame_available_cb != NULL)
                 frame_available_cb(glc_wrapper, context);
diff --git a/compat/surface_flinger/Android.mk b/compat/surface_flinger/Android.mk
index f3ced66..666a298 100644
--- a/compat/surface_flinger/Android.mk
+++ b/compat/surface_flinger/Android.mk
@@ -1,5 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
+include $(LOCAL_PATH)/../Android.common.mk
 
 HYBRIS_PATH := $(LOCAL_PATH)/../../hybris
 
diff --git a/compat/surface_flinger/surface_flinger_compatibility_layer.cpp b/compat/surface_flinger/surface_flinger_compatibility_layer.cpp
index fa1c519..90249e6 100644
--- a/compat/surface_flinger/surface_flinger_compatibility_layer.cpp
+++ b/compat/surface_flinger/surface_flinger_compatibility_layer.cpp
@@ -28,6 +28,9 @@
 #include <ui/PixelFormat.h>
 #include <ui/Region.h>
 #include <ui/Rect.h>
+#if ANDROID_VERSION_MAJOR==5
+  #include <hardware/hwcomposer_defs.h>
+#endif
 
 #include <cassert>
 #include <cstdio>
@@ -80,7 +83,11 @@ void sf_blank(size_t display_id)
 		return;
 	}
 
+#if ANDROID_VERSION_MAJOR<=4
 	android::SurfaceComposerClient::blankDisplay(display);
+#elif ANDROID_VERSION_MAJOR==5
+	android::SurfaceComposerClient::setDisplayPowerMode(display, HWC_POWER_MODE_OFF);
+#endif
 }
 
 void sf_unblank(size_t display_id)
@@ -98,7 +105,11 @@ void sf_unblank(size_t display_id)
 		return;
 	}
 
+#if ANDROID_VERSION_MAJOR<=4
 	android::SurfaceComposerClient::unblankDisplay(display);
+#elif ANDROID_VERSION_MAJOR==5
+	android::SurfaceComposerClient::setDisplayPowerMode(display, HWC_POWER_MODE_NORMAL);
+#endif
 }
 
 size_t sf_get_display_width(size_t display_id)
diff --git a/debian/changelog b/debian/changelog
index a347f90..c14408a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+libhybris (0.1.0+git20151016+6d424c9-0ubuntu1) vivid; urgency=medium
+
+  [ Ricardo Salveti de Araujo ]
+  * New upstream snapshot:
+    - Rebasing patches and removing the ones that are already available in
+      upstream
+
+  [ Alex Tu ]
+  * Fix Build error.
+
+  [ Simon Fels ]
+  * Merge with upstream and rebased chagnes
+
+ -- Simon Fels <[e-mail]>  Fri, 16 Oct 2015 09:14:11 +0200
+
 libhybris (0.1.0+git20131207+e452e83-0ubuntu39) vivid; urgency=medium
 
   * linker: adding dl_iterate_phdr for ARM (required by Android 5 blobs)
diff --git a/debian/copyright b/debian/copyright
index 23dd030..e5f5612 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ Files: compat/ui/* hybris/egl/eglhybris.h hybris/hardware/hardware.c hybris/incl
 Copyright: 2012-2013 Simon Busch <[e-mail]>
 License: Apache 2.0
 
-Files: hybris/include/hybris/internal/binding.h
+Files: hybris/include/hybris/common/binding.h
 Copyright: 2013 Simon Busch <[e-mail]>
            2012 Canonical Ltd
 License: Apache 2.0
diff --git a/debian/libhybris-dev.install b/debian/libhybris-dev.install
index 6cb42b5..904c145 100644
--- a/debian/libhybris-dev.install
+++ b/debian/libhybris-dev.install
@@ -3,15 +3,21 @@ usr/lib/*/libhybris-hwcomposerwindow.so
 usr/lib/*/libsync.so
 usr/lib/*/libui.so
 usr/lib/*/libsf.so
+usr/lib/*/libvibrator.so
 usr/lib/*/libis.so
 usr/lib/*/libcamera.so
 usr/lib/*/libwifi.so
+usr/lib/*/libnfc_nxp.so
+usr/lib/*/libvibrator.so
 usr/lib/*/pkgconfig/hwcomposer-egl.pc
 usr/lib/*/pkgconfig/hybris-egl-platform.pc
 usr/lib/*/pkgconfig/libis.pc
 usr/lib/*/pkgconfig/libcamera.pc
 usr/lib/*/pkgconfig/libwifi.pc
+usr/lib/*/pkgconfig/libvibrator.pc
+usr/lib/*/pkgconfig/libnfc_nxp.pc
 usr/lib/*/pkgconfig/libsf.pc
+usr/lib/*/pkgconfig/libvibrator.pc
 usr/lib/*/pkgconfig/libsync.pc
 usr/include/hybris/input
 usr/include/hybris/camera
diff --git a/debian/libhybris.install.in b/debian/libhybris.install.in
index d7a3157..8ce2e41 100644
--- a/debian/libhybris.install.in
+++ b/debian/libhybris.install.in
@@ -3,9 +3,12 @@ usr/lib/*/libhybris-hwcomposerwindow.so.*
 usr/lib/*/libsync.so.*
 usr/lib/*/libui.so.*
 usr/lib/*/libsf.so.*
+usr/lib/*/libvibrator.so.*
 usr/lib/*/libis.so.*
 usr/lib/*/libcamera.so.*
 usr/lib/*/libwifi.so.*
+usr/lib/*/libnfc_nxp.so.*
+usr/lib/*/libvibrator.so.*
 usr/lib/*/libhybris/*.so
 usr/lib/*/libwayland-egl.so.*		#PKGLIBDIR#
 usr/lib/*/libEGL.so.*		#PKGLIBDIR#
diff --git a/hybris/Makefile.am b/hybris/Makefile.am
index 735a40c..906140e 100644
--- a/hybris/Makefile.am
+++ b/hybris/Makefile.am
@@ -3,8 +3,11 @@ SUBDIRS = include properties common hardware
 if HAS_ANDROID_4_2_0
 SUBDIRS += libsync
 endif
+if HAS_ANDROID_5_0_0
+SUBDIRS += libsync
+endif
+SUBDIRS += egl glesv1 glesv2 ui sf input camera vibrator media wifi
 
-SUBDIRS += egl glesv1 glesv2 ui sf input camera media wifi
 if HAS_LIBNFC_NXP_HEADERS
 SUBDIRS += libnfc_nxp libnfc_ndef_nxp
 endif
diff --git a/hybris/camera/Makefile.am b/hybris/camera/Makefile.am
index 14ad97e..63aec2e 100644
--- a/hybris/camera/Makefile.am
+++ b/hybris/camera/Makefile.am
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = \
 	libcamera.la
 
 libcamera_la_SOURCES = camera.c
-libcamera_la_CFLAGS = -I$(top_srcdir)/include
+libcamera_la_CFLAGS = -I$(top_srcdir)/include $(ANDROID_HEADERS_CFLAGS)
 if WANT_TRACE
 libcamera_la_CFLAGS += -DDEBUG
 endif
diff --git a/hybris/camera/camera.c b/hybris/camera/camera.c
index ce4046d..41071a1 100644
--- a/hybris/camera/camera.c
+++ b/hybris/camera/camera.c
@@ -17,10 +17,11 @@
  *              Ricardo Salveti de Araujo <[e-mail]>
  */
 
+#include <android-config.h>
 #include <dlfcn.h>
 #include <stddef.h>
 
-#include <hybris/internal/binding.h>
+#include <hybris/common/binding.h>
 #include <hybris/camera/camera_compatibility_layer.h>
 #include <hybris/camera/camera_compatibility_layer_capabilities.h>
 #include <hybris/surface_flinger/surface_flinger_compatibility_layer.h>
diff --git a/hybris/common/Makefile.am b/hybris/common/Makefile.am
index bdb1845..2c795b3 100644
--- a/hybris/common/Makefile.am
+++ b/hybris/common/Makefile.am
@@ -6,11 +6,16 @@ if HAS_ANDROID_4_0_0
 SUBDIRS = jb
 libhybris_common_la_LIBADD= jb/libandroid-linker.la
 else
+if HAS_ANDROID_5_0_0
+SUBDIRS = jb
+libhybris_common_la_LIBADD= jb/libandroid-linker.la
+else
 if HAS_ANDROID_2_3_0
 SUBDIRS = gingerbread
 libhybris_common_la_LIBADD= gingerbread/libandroid-linker.la
 else
-ERROR
+$(error No Android Version is defined)
+endif
 endif
 endif
 
@@ -23,6 +28,7 @@ libhybris_common_la_SOURCES = \
 	sysconf.c
 libhybris_common_la_CFLAGS = \
 	-I$(top_srcdir)/include \
+	$(ANDROID_HEADERS_CFLAGS) \
 	-I$(top_srcdir)/common
 if WANT_TRACE
 libhybris_common_la_CFLAGS += -DDEBUG
diff --git a/hybris/common/dlfcn.c b/hybris/common/dlfcn.c
index 80601fd..0ddc41e 100644
--- a/hybris/common/dlfcn.c
+++ b/hybris/common/dlfcn.c
@@ -16,7 +16,7 @@
  */
 
 #include <../include/hybris/dlfcn/dlfcn.h>
-#include <../include/hybris/internal/binding.h>
+#include <../include/hybris/common/binding.h>
 
 void *hybris_dlopen(const char *filename, int flag)
 {
diff --git a/hybris/common/gingerbread/Makefile.am b/hybris/common/gingerbread/Makefile.am
index 92f81c5..f265879 100644
--- a/hybris/common/gingerbread/Makefile.am
+++ b/hybris/common/gingerbread/Makefile.am
@@ -16,6 +16,7 @@ libandroid_linker_la_SOURCES = \
 	rt.c
 libandroid_linker_la_CFLAGS = \
 	-I$(top_srcdir)/include \
+	$(ANDROID_HEADERS_CFLAGS) \
 	-I$(top_srcdir)/common \
 	-DLINKER_TEXT_BASE=0xB0000100 \
 	-DLINKER_AREA_SIZE=0x01000000 \
diff --git a/hybris/common/hooks.c b/hybris/common/hooks.c
index 84f841e..78c9a02 100644
--- a/hybris/common/hooks.c
+++ b/hybris/common/hooks.c
@@ -17,7 +17,7 @@
  *
  */
 
-#include <hybris/internal/floating_point_abi.h>
+#include <hybris/common/binding.h>
 
 #include "hooks_shm.h"
 
@@ -33,15 +33,17 @@
 #include <strings.h>
 #include <dlfcn.h>
 #include <pthread.h>
+#include <sys/xattr.h>
+#include <grp.h>
 #include <signal.h>
 #include <errno.h>
 #include <dirent.h>
 #include <sys/types.h>
-#include <sys/xattr.h>
-#include <grp.h>
+#include <stdarg.h>
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
+#include <fcntl.h>
 
 #include <linux/futex.h>
 #include <sys/syscall.h>
@@ -51,6 +53,8 @@
 #include <unistd.h>
 #include <syslog.h>
 #include <locale.h>
+#include <sys/syscall.h>
+#include <sys/auxv.h>
 
 #include <hybris/properties/properties.h>
 
@@ -245,6 +249,11 @@ static size_t my_strlen(const char *s)
     return strlen(s);
 }
 
+static pid_t my_gettid( void )
+{
+        return syscall( __NR_gettid );
+}
+
 /*
  * Main pthread functions
  *
@@ -559,7 +568,6 @@ static int my_pthread_mutex_lock_timeout_np(pthread_mutex_t *__mutex, unsigned _
         *((int *)__mutex) = (int) realmutex;
     }
 
-    /* TODO: Android uses CLOCK_MONOTONIC here but I am not sure which one to use */
     clock_gettime(CLOCK_REALTIME, &tv);
     tv.tv_sec += __msecs/1000;
     tv.tv_nsec += (__msecs % 1000) * 1000000;
@@ -776,7 +784,6 @@ static int my_pthread_cond_timedwait_relative_np(pthread_cond_t *cond,
         *((unsigned int *) mutex) = (unsigned int) realmutex;
     }
 
-    /* TODO: Android uses CLOCK_MONOTONIC here but I am not sure which one to use */
     struct timespec tv;
     clock_gettime(CLOCK_REALTIME, &tv);
     tv.tv_sec += reltime->tv_sec;
@@ -1239,39 +1246,77 @@ static int my_setlinebuf(FILE *fp)
     return 0;
 }
 
-static inline void swap(void **a, void **b)
-{
-    void *tmp = *a;
-    *a = *b;
-    *b = tmp;
-}
+/* "struct dirent" from bionic/libc/include/dirent.h */
+struct bionic_dirent {
+    uint64_t         d_ino;
+    int64_t          d_off;
+    unsigned short   d_reclen;
+    unsigned char    d_type;
+    char             d_name[256];
+};
 
-static int my_getaddrinfo(const char *hostname, const char *servname,
-    const struct addrinfo *hints, struct addrinfo **res)
+static struct bionic_dirent *my_readdir(DIR *dirp)
 {
-    // make a local copy of hints
-    struct addrinfo *fixed_hints = (struct addrinfo*)malloc(sizeof(struct addrinfo));
-    memcpy(fixed_hints, hints, sizeof(struct addrinfo));
-    // fix bionic -> glibc missmatch
-    swap((void**)&(fixed_hints->ai_canonname), (void**)&(fixed_hints->ai_addr));
-    // do glibc getaddrinfo
-    int result = getaddrinfo(hostname, servname, fixed_hints, res);
-    // release the copy of hints
-    free(fixed_hints);
-    // fix bionic <- glibc missmatch
-    struct addrinfo *it = *res;
-    while(NULL != it)
-    {
-        swap((void**)&(it->ai_canonname), (void**)&(it->ai_addr));
-        it = it->ai_next;
+    /**
+     * readdir(3) manpage says:
+     *  The data returned by readdir() may be overwritten by subsequent calls
+     *  to readdir() for the same directory stream.
+     *
+     * XXX: At the moment, for us, the data will be overwritten even by
+     * subsequent calls to /different/ directory streams. Eventually fix that
+     * (e.g. by storing per-DIR * bionic_dirent structs, and removing them on
+     * closedir, requires hooking of all funcs returning/taking DIR *) and
+     * handling the additional data attachment there)
+     **/
+
+    static struct bionic_dirent result;
+
+    struct dirent *real_result = readdir(dirp);
+    if (!real_result) {
+        return NULL;
     }
-    return result;
+
+    result.d_ino = real_result->d_ino;
+    result.d_off = real_result->d_off;
+    result.d_reclen = real_result->d_reclen;
+    result.d_type = real_result->d_type;
+    memcpy(result.d_name, real_result->d_name, sizeof(result.d_name));
+
+    // Make sure the string is zero-terminated, even if cut off (which
+    // shouldn't happen, as both bionic and glibc have d_name defined
+    // as fixed array of 256 chars)
+    result.d_name[sizeof(result.d_name)-1] = '\0';
+    return &result;
 }
 
-static void my_freeaddrinfo(struct addrinfo *__ai)
+static int my_readdir_r(DIR *dir, struct bionic_dirent *entry,
+        struct bionic_dirent **result)
 {
-    swap((void**)&(__ai->ai_canonname), (void**)&(__ai->ai_addr));
-    freeaddrinfo(__ai);
+    struct dirent entry_r;
+    struct dirent *result_r;
+
+    int res = readdir_r(dir, &entry_r, &result_r);
+
+    if (res == 0) {
+        if (result_r != NULL) {
+            *result = entry;
+
+            entry->d_ino = entry_r.d_ino;
+            entry->d_off = entry_r.d_off;
+            entry->d_reclen = entry_r.d_reclen;
+            entry->d_type = entry_r.d_type;
+            memcpy(entry->d_name, entry_r.d_name, sizeof(entry->d_name));
+
+            // Make sure the string is zero-terminated, even if cut off (which
+            // shouldn't happen, as both bionic and glibc have d_name defined
+            // as fixed array of 256 chars)
+            entry->d_name[sizeof(entry->d_name) - 1] = '\0';
+        } else {
+            *result = NULL;
+        }
+    }
+
+    return res;
 }
 
 extern long my_sysconf(int name);
@@ -1291,11 +1336,6 @@ static int __my_system_property_read(const void *pi, char *name, char *value)
     return property_get(name, value, NULL);
 }
 
-static int __my_system_property_get(const char *name, char *value)
-{
-    return property_get(name, value, NULL);
-}
-
 static int __my_system_property_foreach(void (*propfn)(const void *pi, void *cookie), void *cookie)
 {
     return 0;
@@ -1337,10 +1377,71 @@ static const void *__my_system_property_find_nth(unsigned n)
 }
 
 extern int __cxa_atexit(void (*)(void*), void*, void*);
+extern void __cxa_finalize(void * d);
+
+struct open_redirect {
+	const char *from;
+	const char *to;
+};
+
+struct open_redirect open_redirects[] = {
+	{ "/dev/log/main", "/dev/alog/main" },
+	{ "/dev/log/radio", "/dev/alog/radio" },
+	{ "/dev/log/system", "/dev/alog/system" },
+	{ "/dev/log/events", "/dev/alog/events" },
+	{ NULL, NULL }
+};
+
+int my_open(const char *pathname, int flags, ...)
+{
+	va_list ap;
+	mode_t mode = 0;
+	const char *target_path = pathname;
+
+	if (pathname != NULL) {
+		struct open_redirect *entry = &open_redirects[0];
+		while (entry->from != NULL) {
+			if (strcmp(pathname, entry->from) == 0) {
+				target_path = entry->to;
+				break;
+			}
+			entry++;
+		}
+	}
+
+	if (flags & O_CREAT) {
+		va_start(ap, flags);
+		mode = va_arg(ap, mode_t);
+		va_end(ap);
+	}
+
+	return open(target_path, flags, mode);
+}
+
+/**
+ * NOTE: Normally we don't have to wrap __system_property_get (libc.so) as it is only used
+ * through the property_get (libcutils.so) function. However when property_get is used
+ * internally in libcutils.so we don't have any chance to hook our replacement in.
+ * Therefore we have to hook __system_property_get too and just replace it with the
+ * implementation of our internal property handling
+ */
+
+int my_system_property_get(const char *name, const char *value)
+{
+	return property_get(name, value, NULL);
+}
+
+static __thread void *tls_hooks[16];
+
+void *__get_tls_hooks()
+{
+  return tls_hooks;
+}
 
 static struct _hook hooks[] = {
     {"property_get", property_get },
     {"property_set", property_set },
+    {"__system_property_get", my_system_property_get },
     {"getenv", getenv },
     {"printf", printf },
     {"malloc", my_malloc },
@@ -1408,6 +1509,9 @@ static struct _hook hooks[] = {
     {"opendir", opendir},
     {"closedir", closedir},
     /* pthread.h */
+    {"getauxval", getauxval},
+    {"gettid", my_gettid},
+    {"getpid", getpid},
     {"pthread_atfork", pthread_atfork},
     {"pthread_create", my_pthread_create},
     {"pthread_kill", pthread_kill},
@@ -1541,14 +1645,32 @@ static struct _hook hooks[] = {
     {"__errno", __errno_location},
     {"__set_errno", my_set_errno},
     /* net specifics, to avoid __res_get_state */
-    {"getaddrinfo", my_getaddrinfo},
-    {"freeaddrinfo", my_freeaddrinfo},
+    {"getaddrinfo", getaddrinfo},
     {"gethostbyaddr", gethostbyaddr},
     {"gethostbyname", gethostbyname},
     {"gethostbyname2", gethostbyname2},
     {"gethostent", gethostent},
     {"strftime", strftime},
     {"sysconf", my_sysconf},
+    {"dlopen", android_dlopen},
+    {"dlerror", android_dlerror},
+    {"dlsym", android_dlsym},
+    {"dladdr", android_dladdr},
+    {"dlclose", android_dlclose},
+    /* dirent.h */
+    {"opendir", opendir},
+    {"fdopendir", fdopendir},
+    {"closedir", closedir},
+    {"readdir", my_readdir},
+    {"readdir_r", my_readdir_r},
+    {"rewinddir", rewinddir},
+    {"seekdir", seekdir},
+    {"telldir", telldir},
+    {"dirfd", dirfd},
+    /* fcntl.h */
+    {"open", my_open},
+    // TODO: scandir, scandirat, alphasort, versionsort
+    {"__get_tls_hooks", __get_tls_hooks},
     {"sscanf", sscanf},
     {"scanf", scanf},
     {"vscanf", vscanf},
@@ -1569,8 +1691,8 @@ static struct _hook hooks[] = {
     /* grp.h */
     {"getgrgid", getgrgid},
     {"__cxa_atexit", __cxa_atexit},
+    {"__cxa_finalize", __cxa_finalize},
     {"__system_property_read", __my_system_property_read},
-    {"__system_property_get", __my_system_property_get},
     {"__system_property_set", property_set},
     {"__system_property_foreach", __my_system_property_foreach},
     {"__system_property_find", __my_system_property_find},
diff --git a/hybris/common/ics/Makefile.am b/hybris/common/ics/Makefile.am
index bba1b2b..de4bdad 100644
--- a/hybris/common/ics/Makefile.am
+++ b/hybris/common/ics/Makefile.am
@@ -16,6 +16,7 @@ libandroid_linker_la_SOURCES = \
 	rt.c
 libandroid_linker_la_CFLAGS = \
 	-I$(top_srcdir)/include \
+	$(ANDROID_HEADERS_CFLAGS)\
 	-I$(top_srcdir)/common \
 	-DLINKER_TEXT_BASE=0xB0000100 \
 	-DLINKER_AREA_SIZE=0x01000000 \
diff --git a/hybris/common/jb/Makefile.am b/hybris/common/jb/Makefile.am
index 142bc82..c95ea22 100644
--- a/hybris/common/jb/Makefile.am
+++ b/hybris/common/jb/Makefile.am
@@ -16,6 +16,7 @@ libandroid_linker_la_SOURCES = \
 	rt.c
 libandroid_linker_la_CFLAGS = \
 	-I$(top_srcdir)/include \
+	$(ANDROID_HEADERS_CFLAGS) \
 	-I$(top_srcdir)/common \
 	-D_GNU_SOURCE \
 	-DLINKER_TEXT_BASE=0xB0000100 \
diff --git a/hybris/common/jb/dlfcn.c b/hybris/common/jb/dlfcn.c
index 96c2478..9e39889 100644
--- a/hybris/common/jb/dlfcn.c
+++ b/hybris/common/jb/dlfcn.c
@@ -180,7 +180,6 @@ _Unwind_Ptr android_dl_unwind_find_exidx(_Unwind_Ptr pc, int *pcount);
 //                     0123456 78901234 567890 12345678 9012345 6789012345678901
 #define ANDROID_LIBDL_STRTAB \
                       "dlopen\0dlclose\0dlsym\0dlerror\0dladdr\0dl_iterate_phdr\0"
-
 #elif defined(ANDROID_SH_LINKER)
 //                     0000000 00011111 111112 22222222 2333333 3333444444444455
 //                     0123456 78901234 567890 12345678 9012345 6789012345678901
@@ -258,7 +257,7 @@ static Elf_Sym libdl_symtab[] = {
  * stubbing them out in libdl.
  */
 static unsigned libdl_buckets[1] = { 1 };
-#ifdef ANDROID_ARM_LINKER
+#if defined(ANDROID_ARM_LINKER)
 static unsigned libdl_chains[8] = { 0, 2, 3, 4, 5, 6, 7, 0 };
 #else
 static unsigned libdl_chains[7] = { 0, 2, 3, 4, 5, 6, 0 };
@@ -271,6 +270,7 @@ soinfo libdl_info = {
     strtab: ANDROID_LIBDL_STRTAB,
     symtab: libdl_symtab,
 
+    refcount: 1,
     nbucket: sizeof(libdl_buckets)/sizeof(unsigned),
     nchain: sizeof(libdl_chains)/sizeof(unsigned),
     bucket: libdl_buckets,
diff --git a/hybris/common/jb/linker.c b/hybris/common/jb/linker.c
index 1d723f6..20333db 100644
--- a/hybris/common/jb/linker.c
+++ b/hybris/common/jb/linker.c
@@ -358,7 +358,6 @@ _Unwind_Ptr android_dl_unwind_find_exidx(_Unwind_Ptr pc, int *pcount)
     return NULL;
 }
 #endif
-
 /* Here, we only have to provide a callback to iterate across all the
  * loaded libraries. gcc_eh does the rest. */
 int
@@ -1340,7 +1339,7 @@ static int reloc_library(soinfo *si, Elf_Rel *rel, unsigned count)
                 /* We only allow an undefined symbol if this is a weak
                    reference..   */
                 s = &symtab[sym];
-                if (ELF32_ST_BIND(s->st_info) != STB_WEAK) {
+                if (ELF32_ST_BIND(s->st_info) != STB_WEAK && strcmp(si->name, "libdsyscalls.so") != 0) {
                     DL_ERR("%5d cannot locate '%s'...\n", pid, sym_name);
                     return -1;
                 }
diff --git a/hybris/common/logging.c b/hybris/common/logging.c
index 2683136..0c4c79b 100644
--- a/hybris/common/logging.c
+++ b/hybris/common/logging.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <pthread.h>
+#include <time.h>
 
 FILE *hybris_logging_target = NULL;
 
@@ -109,6 +110,17 @@ hybris_get_thread_id()
     return (void *)pthread_self();
 }
 
+double
+hybris_get_thread_time()
+{
+    struct timespec now;
+    if(clock_gettime(CLOCK_THREAD_CPUTIME_ID, &now) == 0) {
+	return (double)now.tv_sec + (double)now.tv_nsec / 1000000000.0;
+    } else {
+	return -1.0;
+    }    
+}
+
 int
 hybris_should_trace(const char *module, const char *tracepoint)
 {
diff --git a/hybris/common/logging.h b/hybris/common/logging.h
index 146eb6e..f4841b9 100644
--- a/hybris/common/logging.h
+++ b/hybris/common/logging.h
@@ -69,6 +69,9 @@ hybris_set_log_level(enum hybris_log_level level);
 void *
 hybris_get_thread_id();
 
+double
+hybris_get_thread_time();
+
 enum hybris_log_format hybris_logging_format();
 
 int hybris_should_trace(const char *module, const char *tracepoint);
@@ -93,13 +96,13 @@ extern FILE *hybris_logging_target;
                        ##__VA_ARGS__); \
                 fflush(hybris_logging_target); \
               } else if (hybris_logging_format() == HYBRIS_LOG_FORMAT_SYSTRACE) { \
-                fprintf(hybris_logging_target, "B|%i|%s(%s) %s:%d (%s) " message "\n", \
-                      getpid(), module, __PRETTY_FUNCTION__, __FILE__, __LINE__, \
+                fprintf(hybris_logging_target, "B|%i|%.9f|%s(%s) %s:%d (%s) " message "\n", \
+                      getpid(), hybris_get_thread_time(), module, __PRETTY_FUNCTION__, __FILE__, __LINE__, \
                       #level + 11 /* + 11 = strip leading "HYBRIS_LOG_" */, \
                       ##__VA_ARGS__); \
                 fflush(hybris_logging_target); \
-                fprintf(hybris_logging_target, "E|%i|%s(%s) %s:%d (%s) " message "\n", \
-                      getpid(), module, __PRETTY_FUNCTION__, __FILE__, __LINE__, \
+                fprintf(hybris_logging_target, "E|%i|%.9f|%s(%s) %s:%d (%s) " message "\n", \
+                      getpid(), hybris_get_thread_time(), module, __PRETTY_FUNCTION__, __FILE__, __LINE__, \
                       #level + 11 /* + 11 = strip leading "HYBRIS_LOG_" */, \
                       ##__VA_ARGS__); \
                 fflush(hybris_logging_target); \
@@ -113,19 +116,19 @@ extern FILE *hybris_logging_target;
               pthread_mutex_lock(&hybris_logging_mutex); \
               if (hybris_logging_format() == HYBRIS_LOG_FORMAT_NORMAL) \
               { \
-                fprintf(hybris_logging_target, "PID: %i Tracepoint-%c/%s::%s" message "\n", \
-                      getpid(), what, tracepoint, module, \
+                fprintf(hybris_logging_target, "PID: %i TTIME: %.9f Tracepoint-%c/%s::%s" message "\n", \
+                      getpid(), hybris_get_thread_time(), what, tracepoint, module, \
                       ##__VA_ARGS__); \
                 fflush(hybris_logging_target); \
               } else if (hybris_logging_format() == HYBRIS_LOG_FORMAT_SYSTRACE) { \
                 if (what == 'B') \
-                   fprintf(hybris_logging_target, "B|%i|%s::%s" message "", \
-                      getpid(), tracepoint, module, ##__VA_ARGS__); \
+                   fprintf(hybris_logging_target, "B|%i|%.9f|%s::%s" message "", \
+                      getpid(), hybris_get_thread_time(), tracepoint, module, ##__VA_ARGS__); \
                 else if (what == 'E') \
                    fprintf(hybris_logging_target, "E"); \
                 else \
-                   fprintf(hybris_logging_target, "C|%i|%s::%s-%i|" message "", \
-                      getpid(), tracepoint, module, getpid(), ##__VA_ARGS__); \
+                   fprintf(hybris_logging_target, "C|%i|%.9f|%s::%s-%i|" message "", \
+                      getpid(), hybris_get_thread_time(), tracepoint, module, getpid(), ##__VA_ARGS__); \
                 fflush(hybris_logging_target); \
               } \
              pthread_mutex_unlock(&hybris_logging_mutex); \
diff --git a/hybris/configure.ac b/hybris/configure.ac
index fef76b9..692d0fc 100644
--- a/hybris/configure.ac
+++ b/hybris/configure.ac
@@ -67,6 +67,11 @@ AC_ARG_ENABLE(wayland,
   [wayland="no"])
 AM_CONDITIONAL( [WANT_WAYLAND], [test x"$wayland" = x"yes"])
 
+AC_ARG_ENABLE(wayland_serverside_buffers,
+  [  --enable-wayland_serverside_buffers            Enable serverside buffer allocation for wayland (default=enabled)],
+  [wayland_serverside_buffers=$enableval],
+  [wayland_serverside_buffers=yes])
+AM_CONDITIONAL( [WANT_WL_SERVERSIDE_BUFFERS], [test x"$wayland_serverside_buffers" = x"yes"])
 
 AC_ARG_ENABLE(arch,
   [  --enable-arch[=arch]     Compile specific CPU target(default=arm)
@@ -102,50 +107,76 @@ AC_ARG_WITH(default-hybris-ld-library-path,
   [ ])
 AC_SUBST(DEFAULT_HYBRIS_LD_LIBRARY_PATH)
 
-
-android_headers_path=""
 AC_ARG_WITH(android-headers,
   [  --with-android-headers=DIR     Use android headers available in DIR. See utils/extract-headers.sh ],
   [
-      if [ ! test -e $withval/android-version.h ]; then
-	echo "Error! missing android-version.h in android header path"
-	exit 1
-      fi 
-      rm -f include/android
-      ln -sf $withval include/android   	
-      android_headers_path="$withval"      
-
-      # According to http://en.wikipedia.org/wiki/Android_version_history#Version_history_by_API_level
-      android_headers_major=`grep -E "define ANDROID_VERSION_MAJOR " $android_headers_path/android-version.h | sed "s|^\#define ANDROID_VERSION_MAJOR \(.*\)$|\1|g"`
-
-      android_headers_minor=`grep -E "define ANDROID_VERSION_MINOR " $android_headers_path/android-version.h | sed "s|^\#define ANDROID_VERSION_MINOR \(.*\)$|\1|g"`
-
-      android_headers_patch=`grep -E "define ANDROID_VERSION_PATCH " $android_headers_path/android-version.h | sed "s|^\#define ANDROID_VERSION_PATCH \(.*\)$|\1|g"`
-  
-      if [ test "x$android_headers_major" = x ]; then
-	  echo "Error! Was unable to locate define ANDROID_VERSION_MAJOR in $android_headers_path/android-version.h"
-      fi
-
-      AC_SUBST(ANDROID_VERSION_MAJOR, [$android_headers_major])
-      AC_SUBST(ANDROID_VERSION_MINOR, [$android_headers_minor])
-      AC_SUBST(ANDROID_VERSION_PATCH, [$android_headers_patch])
-
-      echo "Android headers version is $android_headers_major.$android_headers_minor.$android_headers_patch"
+    AM_CONDITIONAL([HAS_LIBNFC_NXP_HEADERS], [test -f $withval/libnfc-nxp/phLibNfc.h])
+    AS_IF([test -f $withval/libnfc-nxp/phLibNfc.h], [ANDROID_HEADERS_CFLAGS="-I$withval -I$withval/libnfc-nxp"],[ANDROID_HEADERS_CFLAGS="-I$withval"])
+    AC_SUBST([ANDROID_HEADERS_CFLAGS])
   ],
-  [
-      echo "Error! need to provide path to Android headers --with-android-headers=DIR. See utils/extract-headers.sh"
-      exit 1
-  ]
-  )
+  [ PKG_CHECK_MODULES(ANDROID_HEADERS, android-headers,, exit) ]
+)
+CPPFLAGS="$CPPFLAGS $ANDROID_HEADERS_CFLAGS"
+
+AC_CHECK_HEADERS(android-config.h,,AC_MSG_ERROR(required header file is missing))
+AC_CHECK_HEADERS(android-version.h,,AC_MSG_ERROR(required header file is missing))
+
+# AC_AWK_CPP
+AC_DEFUN([AC_AWK_CPP],
+[AC_LANG_PREPROC_REQUIRE()dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])])
+
+ac_awk_cpp_out="`$CPP $CPPFLAGS conftest.$ac_ext|$AWK '$1'`"
+AS_IF([test "x$ac_awk_cpp_out" = x], [$4], [$3])
+rm -f conftest*
+])# AC_AWK_CPP
+
+
+# According to http://en.wikipedia.org/wiki/Android_version_history#Version_history_by_API_level
+###########################
+AC_AWK_CPP([/has_ANDROID_VERSION_MAJOR/ {print \$2;}],
+[
+#include <android-version.h>
+has_ANDROID_VERSION_MAJOR ANDROID_VERSION_MAJOR
+],
+[android_headers_major=$ac_awk_cpp_out],
+[AC_MSG_ERROR(required 'major' version is missing)])
 
-# Add automake tests for version/API needs here that you need in code, including test .am's
 
+###########################
+AC_AWK_CPP([/has_ANDROID_VERSION_MINOR/ {print \$2;}],
+[
+#include <android-version.h>
+has_ANDROID_VERSION_MINOR ANDROID_VERSION_MINOR
+],
+[android_headers_minor=$ac_awk_cpp_out],
+[AC_MSG_ERROR(required 'minor' version is missing)])
+
+###########################
+AC_AWK_CPP([/has_ANDROID_VERSION_PATCH/ {print \$2;}],
+[
+#include <android-version.h>
+has_ANDROID_VERSION_PATCH ANDROID_VERSION_PATCH
+],
+[android_headers_patch=$ac_awk_cpp_out],
+[AC_MSG_ERROR(require 'patch' version is missing)])
+
+AC_MSG_NOTICE("Android headers version is $android_headers_major.$android_headers_minor.$android_headers_patch.$ac_awk_cpp_out")
+###########################
+AC_SUBST(ANDROID_VERSION_MAJOR, [$android_headers_major])
+AC_SUBST(ANDROID_VERSION_MINOR, [$android_headers_minor])
+AC_SUBST(ANDROID_VERSION_PATCH, [$android_headers_patch])
+
+AC_MSG_NOTICE("Android headers version is $android_headers_major.$android_headers_minor.$android_headers_patch")
+
+# Add automake tests for version/API needs here that you need in code, including test .am's
+AM_CONDITIONAL([HAS_ANDROID_5_0_0], [test $android_headers_major -ge 5 -a $android_headers_minor -ge 0 ])
 AM_CONDITIONAL([HAS_ANDROID_4_2_0], [test $android_headers_major -ge 4 -a $android_headers_minor -ge 2 ])
 AM_CONDITIONAL([HAS_ANDROID_4_1_0], [test $android_headers_major -ge 4 -a $android_headers_minor -ge 1 ])
 AM_CONDITIONAL([HAS_ANDROID_4_0_0], [test $android_headers_major -ge 4 -a $android_headers_minor -ge 0 ])
 AM_CONDITIONAL([HAS_ANDROID_2_3_0], [test $android_headers_major -ge 2 -a $android_headers_minor -ge 3 ])
 
-AM_CONDITIONAL([HAS_LIBNFC_NXP_HEADERS], [test -f ${android_headers_path}/libnfc-nxp/phLibNfc.h])
 
 AC_CONFIG_FILES([
 	Makefile
@@ -184,6 +215,8 @@ AC_CONFIG_FILES([
 	input/libis.pc
 	camera/Makefile
 	camera/libcamera.pc
+	vibrator/Makefile
+	vibrator/libvibrator.pc
 	media/Makefile
 	media/libmedia.pc
 	wifi/Makefile
@@ -220,4 +253,3 @@ echo
 echo "------------------------------------------------------------------------"
 echo
 echo "Now type 'make' to compile and 'make install' to install this package."
-
diff --git a/hybris/egl/Makefile.am b/hybris/egl/Makefile.am
index 1837089..de779b9 100644
--- a/hybris/egl/Makefile.am
+++ b/hybris/egl/Makefile.am
@@ -11,7 +11,7 @@ libEGL_la_SOURCES = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = egl.pc
 
-libEGL_la_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/android -DPKGLIBDIR="\"$(pkglibdir)/\"" -I$(top_srcdir)/common -DDEFAULT_EGL_PLATFORM="\"@DEFAULT_EGL_PLATFORM@\"" 
+libEGL_la_CFLAGS = -I$(top_srcdir)/include $(ANDROID_HEADERS_CFLAGS) -DPKGLIBDIR="\"$(pkglibdir)/\"" -I$(top_srcdir)/common -DDEFAULT_EGL_PLATFORM="\"@DEFAULT_EGL_PLATFORM@\""
 if WANT_MESA
 libEGL_la_CFLAGS += -DLIBHYBRIS_WANTS_MESA_X11_HEADERS
 endif
@@ -22,7 +22,7 @@ if WANT_DEBUG
 libEGL_la_CFLAGS += -ggdb -O0
 endif
 
-libEGL_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/android -I$(top_srcdir)/common -DPKGLIBDIR="\"$(pkglibdir)/\""
+libEGL_la_CXXFLAGS = -I$(top_srcdir)/include $(ANDROID_HEADERS_CFLAGS) -I$(top_srcdir)/common -DPKGLIBDIR="\"$(pkglibdir)/\""
 if WANT_MESA
 libEGL_la_CXXFLAGS += -DLIBHYBRIS_WANTS_MESA_X11_HEADERS
 endif
diff --git a/hybris/egl/egl.c b/hybris/egl/egl.c
index 3bd2b25..ffb6d39 100644
--- a/hybris/egl/egl.c
+++ b/hybris/egl/egl.c
@@ -32,14 +32,17 @@
 #include <assert.h>
 
 
-#include <hybris/internal/binding.h>
+#include <hybris/common/binding.h>
 #include <string.h>
 
-#include <android/system/window.h>
+#include <system/window.h>
 #include "logging.h"
 
 static void *_libegl = NULL;
 static void *_libgles = NULL;
+static void *_hybris_libgles1 = NULL;
+static void *_hybris_libgles2 = NULL;
+static int _egl_context_client_version = 1;
 
 static EGLint  (*_eglGetError)(void) = NULL;
 
@@ -122,8 +125,22 @@ static void _init_androidegl()
 	_libgles = (void *) android_dlopen(getenv("LIBGLESV2") ? getenv("LIBGLESV2") : "libGLESv2.so", RTLD_LAZY);
 }
 
-#define EGL_DLSYM(fptr, sym) do { if (_libegl == NULL) { _init_androidegl(); }; if (*(fptr) == NULL) { *(fptr) = (void *) android_dlsym(_libegl, sym); } } while (0) 
-#define GLESv2_DLSYM(fptr, sym) do { if (_libgles == NULL) { _init_androidegl(); }; if (*(fptr) == NULL) { *(fptr) = (void *) android_dlsym(_libgles, sym); } } while (0) 
+static void * _android_egl_dlsym(const char *symbol)
+{
+	if (_libegl == NULL)
+		_init_androidegl();
+
+	return android_dlsym(_libegl, symbol);
+}
+
+struct ws_egl_interface hybris_egl_interface = {
+	_android_egl_dlsym,
+	egl_helper_has_mapping,
+	egl_helper_get_mapping,
+};
+
+#define EGL_DLSYM(fptr, sym) do { if (_libegl == NULL) { _init_androidegl(); }; if (*(fptr) == NULL) { *(fptr) = (void *) android_dlsym(_libegl, sym); } } while (0)
+#define GLESv2_DLSYM(fptr, sym) do { if (_libgles == NULL) { _init_androidegl(); }; if (*(fptr) == NULL) { *(fptr) = (void *) android_dlsym(_libgles, sym); } } while (0)
 
 EGLint eglGetError(void)
 {
@@ -131,40 +148,33 @@ EGLint eglGetError(void)
 	return (*_eglGetError)();
 }
 
-struct _eglDisplayMapping {
-	EGLNativeDisplayType ndt;
-	EGLDisplay display;
-};
-
 #define _EGL_MAX_DISPLAYS 100
 
-struct _eglDisplayMapping *_displayMappings[_EGL_MAX_DISPLAYS];
+struct _EGLDisplay *_displayMappings[_EGL_MAX_DISPLAYS];
 
-void _addMapping(EGLNativeDisplayType display_id, EGLDisplay display)
+void _addMapping(struct _EGLDisplay *display_id)
 {
 	int i;
 	for (i = 0; i < _EGL_MAX_DISPLAYS; i++)
 	{
 		if (_displayMappings[i] == NULL)
 		{
-			_displayMappings[i] = (struct _eglDisplayMapping *) malloc(sizeof(struct _eglDisplayMapping));
-			_displayMappings[i]->ndt = display_id;
-			_displayMappings[i]->display = display;
+			_displayMappings[i] = display_id;
 			return;
 		}
 	}
 }
 
-EGLNativeDisplayType _egldisplay2NDT(EGLDisplay display)
+struct _EGLDisplay *hybris_egl_display_get_mapping(EGLDisplay display)
 {
 	int i;
 	for (i = 0; i < _EGL_MAX_DISPLAYS; i++)
 	{
 		if (_displayMappings[i])
 		{
-			if (_displayMappings[i]->display == display)
+			if (_displayMappings[i]->dpy == display)
 			{
-				return _displayMappings[i]->ndt;
+				return _displayMappings[i];
 			}
 
 		}
@@ -177,17 +187,22 @@ EGLDisplay eglGetDisplay(EGLNativeDisplayType display_id)
 	EGL_DLSYM(&_eglGetDisplay, "eglGetDisplay");
 	EGLNativeDisplayType real_display;
 
-	if (!ws_IsValidDisplay(display_id))
-	{
-		return EGL_NO_DISPLAY;
-	}
-
 	real_display = (*_eglGetDisplay)(EGL_DEFAULT_DISPLAY);
 	if (real_display == EGL_NO_DISPLAY)
 	{
 		return EGL_NO_DISPLAY;
 	}
-	_addMapping(display_id, real_display);
+
+	struct _EGLDisplay *dpy = hybris_egl_display_get_mapping(real_display);
+	if (!dpy) {
+		dpy = ws_GetDisplay(display_id);
+		if (!dpy) {
+			return EGL_NO_DISPLAY;
+		}
+		dpy->dpy = real_display;
+		_addMapping(dpy);
+	}
+
 	return real_display;
 }
 
@@ -200,6 +215,9 @@ EGLBoolean eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
 EGLBoolean eglTerminate(EGLDisplay dpy)
 {
 	EGL_DLSYM(&_eglTerminate, "eglTerminate");
+
+	struct _EGLDisplay *display = hybris_egl_display_get_mapping(dpy);
+	ws_Terminate(display);
 	return (*_eglTerminate)(dpy);
 }
 
@@ -240,12 +258,18 @@ EGLSurface eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config,
 {
 	EGL_DLSYM(&_eglCreateWindowSurface, "eglCreateWindowSurface");
 
-	win = ws_CreateWindow(win,  _egldisplay2NDT(dpy));
-	
+	HYBRIS_TRACE_BEGIN("hybris-egl", "eglCreateWindowSurface", "");
+	struct _EGLDisplay *display = hybris_egl_display_get_mapping(dpy);
+	win = ws_CreateWindow(win, display);
+
 	assert(((struct ANativeWindowBuffer *) win)->common.magic == ANDROID_NATIVE_WINDOW_MAGIC);
 
+	HYBRIS_TRACE_BEGIN("native-egl", "eglCreateWindowSurface", "");
 	EGLSurface result = (*_eglCreateWindowSurface)(dpy, config, win, attrib_list);
+	HYBRIS_TRACE_END("native-egl", "eglCreateWindowSurface", "");
 	egl_helper_push_mapping(result, win);
+
+	HYBRIS_TRACE_END("hybris-egl", "eglCreateWindowSurface", "");
 	return result;
 }
 
@@ -341,8 +365,26 @@ EGLBoolean eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
 
 EGLBoolean eglSwapInterval(EGLDisplay dpy, EGLint interval)
 {
+	EGLBoolean ret;
+	EGLSurface surface;
+	EGLNativeWindowType win;
+	HYBRIS_TRACE_BEGIN("hybris-egl", "eglSwapInterval", "=%d", interval);
+
+	/* Some egl implementations don't pass through the setSwapInterval
+	 * call.  Since we may support various swap intervals internally, we'll
+	 * call it anyway and then give the wrapped egl implementation a chance
+	 * to chage it. */
+	EGL_DLSYM(&_eglGetCurrentSurface, "eglGetCurrentSurface");
+	surface = (*_eglGetCurrentSurface)(EGL_DRAW);
+	if (egl_helper_has_mapping(surface))
+	    ws_setSwapInterval(dpy, egl_helper_get_mapping(surface), interval);
+
+	HYBRIS_TRACE_BEGIN("native-egl", "eglSwapInterval", "=%d", interval);
 	EGL_DLSYM(&_eglSwapInterval, "eglSwapInterval");
-	return (*_eglSwapInterval)(dpy, interval);
+	ret = (*_eglSwapInterval)(dpy, interval);
+	HYBRIS_TRACE_END("native-egl", "eglSwapInterval", "");
+	HYBRIS_TRACE_END("hybris-egl", "eglSwapInterval", "");
+	return ret;
 }
 
 EGLContext eglCreateContext(EGLDisplay dpy, EGLConfig config,
@@ -350,6 +392,15 @@ EGLContext eglCreateContext(EGLDisplay dpy, EGLConfig config,
 		const EGLint *attrib_list)
 {
 	EGL_DLSYM(&_eglCreateContext, "eglCreateContext");
+
+	EGLint *p = attrib_list;
+	while (p != NULL && *p != EGL_NONE) {
+		if (*p == EGL_CONTEXT_CLIENT_VERSION) {
+			_egl_context_client_version = p[1];
+		}
+		p += 2;
+	}
+
 	return (*_eglCreateContext)(dpy, config, share_context, attrib_list);
 }
 
@@ -400,15 +451,33 @@ EGLBoolean eglWaitGL(void)
 EGLBoolean eglWaitNative(EGLint engine)
 {
 	EGL_DLSYM(&_eglWaitNative, "eglWaitNative");
-	return (*_eglWaitNative)(engine); 
+	return (*_eglWaitNative)(engine);
+}
+
+EGLBoolean _my_eglSwapBuffersWithDamageEXT(EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects)
+{
+	EGLNativeWindowType win;
+	EGLBoolean ret;
+	HYBRIS_TRACE_BEGIN("hybris-egl", "eglSwapBuffersWithDamageEXT", "");
+	EGL_DLSYM(&_eglSwapBuffers, "eglSwapBuffers");
+
+	if (egl_helper_has_mapping(surface)) {
+		win = egl_helper_get_mapping(surface);
+		ws_prepareSwap(dpy, win, rects, n_rects);
+		ret = (*_eglSwapBuffers)(dpy, surface);
+		ws_finishSwap(dpy, win);
+	} else {
+		ret = (*_eglSwapBuffers)(dpy, surface);
+	}
+	HYBRIS_TRACE_END("hybris-egl", "eglSwapBuffersWithDamageEXT", "");
+	return ret;
 }
 
 EGLBoolean eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)
 {
-	EGLBoolean ret; 
+	EGLBoolean ret;
 	HYBRIS_TRACE_BEGIN("hybris-egl", "eglSwapBuffers", "");
-	EGL_DLSYM(&_eglSwapBuffers, "eglSwapBuffers");
-	ret = (*_eglSwapBuffers)(dpy, surface);
+	ret = _my_eglSwapBuffersWithDamageEXT(dpy, surface, NULL, 0);
 	HYBRIS_TRACE_END("hybris-egl", "eglSwapBuffers", "");
 	return ret;
 }
@@ -420,6 +489,7 @@ EGLBoolean eglCopyBuffers(EGLDisplay dpy, EGLSurface surface,
 	return (*_eglCopyBuffers)(dpy, surface, target);
 }
 
+
 static EGLImageKHR _my_eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)
 {
 	EGL_DLSYM(&_eglCreateImageKHR, "eglCreateImageKHR");
@@ -429,14 +499,27 @@ static EGLImageKHR _my_eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum
 	const EGLint *newattrib_list = attrib_list;
 
 	ws_passthroughImageKHR(&newctx, &newtarget, &newbuffer, &newattrib_list);
-	return (*_eglCreateImageKHR)(dpy, newctx, newtarget, newbuffer, newattrib_list);
+
+	EGLImageKHR eik = (*_eglCreateImageKHR)(dpy, newctx, newtarget, newbuffer, newattrib_list);
+
+	if (eik == EGL_NO_IMAGE_KHR) {
+		return EGL_NO_IMAGE_KHR;
+	}
+
+	struct egl_image *image;
+	image = malloc(sizeof *image);
+	image->egl_image = eik;
+	image->egl_buffer = buffer;
+	image->target = target;
+
+	return (EGLImageKHR)image;
 }
 
 static void _my_glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)
 {
 	GLESv2_DLSYM(&_glEGLImageTargetTexture2DOES, "glEGLImageTargetTexture2DOES");
-	(*_glEGLImageTargetTexture2DOES)(target, image);
-	return;
+	struct egl_image *img = image;
+	(*_glEGLImageTargetTexture2DOES)(target, img ? img->egl_image : NULL);
 }
 
 __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname)
@@ -445,19 +528,49 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname)
 	if (strcmp(procname, "eglCreateImageKHR") == 0)
 	{
 		return _my_eglCreateImageKHR;
-	} 
+	}
+	else if (strcmp(procname, "eglDestroyImageKHR") == 0)
+	{
+		return eglDestroyImageKHR;
+	}
+	else if (strcmp(procname, "eglSwapBuffersWithDamageEXT") == 0)
+	{
+		return _my_eglSwapBuffersWithDamageEXT;
+	}
 	else if (strcmp(procname, "glEGLImageTargetTexture2DOES") == 0)
 	{
 		return _my_glEGLImageTargetTexture2DOES;
 	}
-	__eglMustCastToProperFunctionPointerType ret = ws_eglGetProcAddress(procname);
+
+	__eglMustCastToProperFunctionPointerType ret = NULL;
+
+	switch (_egl_context_client_version) {
+		case 1:  // OpenGL ES 1.x API
+			if (_hybris_libgles1 == NULL) {
+				_hybris_libgles1 = (void *) dlopen(getenv("HYBRIS_LIBGLESV1") ?: "libGLESv1_CM.so.1", RTLD_LAZY);
+			}
+			ret = _hybris_libgles1 ? dlsym(_hybris_libgles1, procname) : NULL;
+			break;
+		case 2:  // OpenGL ES 2.0 API
+			if (_hybris_libgles2 == NULL) {
+				_hybris_libgles2 = (void *) dlopen(getenv("HYBRIS_LIBGLESV2") ?: "libGLESv2.so.2", RTLD_LAZY);
+			}
+			ret = _hybris_libgles2 ? dlsym(_hybris_libgles2, procname) : NULL;
+			break;
+		case 3:  // OpenGL ES 3.x API
+			// TODO: Load from libGLESv3.so once we have OpenGL ES 3.0/3.1 support
+			break;
+		default:
+			HYBRIS_WARN("Unknown EGL context client version: %d", _egl_context_client_version);
+			break;
+	}
+
+	if (ret == NULL) {
+		ret = ws_eglGetProcAddress(procname);
+	}
 
 	if (ret == NULL) {
-#ifdef RTLD_DEFAULT
-		ret = dlsym(RTLD_DEFAULT, procname);
-		if (ret == NULL)
-#endif
-			ret = (*_eglGetProcAddress)(procname);
+		ret = (*_eglGetProcAddress)(procname);
 	}
 
 	return ret;
@@ -466,8 +579,13 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char *procname)
 EGLBoolean eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
 {
 	EGL_DLSYM(&_eglDestroyImageKHR, "eglDestroyImageKHR");
-	return (*_eglDestroyImageKHR)(dpy, image);
+	struct egl_image *img = image;
+	EGLBoolean ret = (*_eglDestroyImageKHR)(dpy, img ? img->egl_image : NULL);
+	if (ret == EGL_TRUE) {
+		free(img);
+		return EGL_TRUE;
+	}
+	return ret;
 }
 
-
 // vim:ts=4:sw=4:noexpandtab
diff --git a/hybris/egl/eglhybris.h b/hybris/egl/eglhybris.h
index 2aeed65..b777166 100644
--- a/hybris/egl/eglhybris.h
+++ b/hybris/egl/eglhybris.h
@@ -18,10 +18,10 @@
 #ifndef EGL_HYBRIS_H_
 #define EGL_HYBRIS_H_
 
-#include <android/hardware/gralloc.h>
+#include <hardware/gralloc.h>
 /* Needed for ICS window.h */
 #include <string.h>
-#include <android/system/window.h>
+#include <system/window.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,6 +31,12 @@ int hybris_register_buffer_handle(buffer_handle_t handle);
 int hybris_unregister_buffer_handle(buffer_handle_t handle);
 void hybris_dump_buffer_to_file(struct ANativeWindowBuffer *buf);
 
+void *hybris_android_egl_dlsym(const char *symbol);
+int hybris_egl_has_mapping(EGLSurface surface);
+EGLNativeWindowType hybris_egl_get_mapping(EGLSurface surface);
+
+struct _EGLDisplay *hybris_egl_display_get_mapping(EGLDisplay dpy);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/hybris/egl/helper.cpp b/hybris/egl/helper.cpp
index 8370ccc..b1c84c2 100644
--- a/hybris/egl/helper.cpp
+++ b/hybris/egl/helper.cpp
@@ -40,6 +40,17 @@ int egl_helper_has_mapping(EGLSurface surface)
     return (_surface_window_map.find(surface) != _surface_window_map.end());
 }
 
+EGLNativeWindowType egl_helper_get_mapping(EGLSurface surface)
+{
+    std::map<EGLSurface,EGLNativeWindowType>::iterator it;
+    it = _surface_window_map.find(surface);
+
+    /* Caller must check with egl_helper_has_mapping() before */
+    assert(it != _surface_window_map.end());
+
+    return it->second;
+}
+
 EGLNativeWindowType egl_helper_pop_mapping(EGLSurface surface)
 {
     std::map<EGLSurface,EGLNativeWindowType>::iterator it;
diff --git a/hybris/egl/helper.h b/hybris/egl/helper.h
index ee313ab..1b3144b 100644
--- a/hybris/egl/helper.h
+++ b/hybris/egl/helper.h
@@ -36,6 +36,9 @@ void egl_helper_push_mapping(EGLSurface surface, EGLNativeWindowType window);
 /* Check if a mapping for a surface exist */
 int egl_helper_has_mapping(EGLSurface surface);
 
+/* Return (without removing) the mapping for a surface */
+EGLNativeWindowType egl_helper_get_mapping(EGLSurface surface);
+
 /* Return and remove the mapping for a surface */
 EGLNativeWindowType egl_helper_pop_mapping(EGLSurface surface);
 
diff --git a/hybris/egl/platforms/Makefile.am b/hybris/egl/platforms/Makefile.am
index 5da4211..4126752 100644
--- a/hybris/egl/platforms/Makefile.am
+++ b/hybris/egl/platforms/Makefile.am
@@ -3,6 +3,9 @@ SUBDIRS = common null fbdev
 if HAS_ANDROID_4_2_0
 SUBDIRS += hwcomposer
 endif
+if HAS_ANDROID_5_0_0
+SUBDIRS += hwcomposer
+endif
 
 if WANT_WAYLAND
 SUBDIRS += wayland
diff --git a/hybris/egl/platforms/common/Makefile.am b/hybris/egl/platforms/common/Makefile.am
index 2be0d75..3c3aa64 100644
--- a/hybris/egl/platforms/common/Makefile.am
+++ b/hybris/egl/platforms/common/Makefile.am
@@ -37,7 +37,7 @@ BUILT_SOURCES = wayland-android-protocol.c \
 
 libwayland_egl_la_SOURCES = wayland-egl.c
 
-libwayland_egl_la_CFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/include/android $(WAYLAND_CLIENT_CFLAGS) $(WAYLAND_SERVER_CFLAGS)
+libwayland_egl_la_CFLAGS = -I. -I$(top_srcdir)/include $(ANDROID_HEADERS_CFLAGS) $(WAYLAND_CLIENT_CFLAGS) $(WAYLAND_SERVER_CFLAGS)
 if WANT_TRACE
 libwayland_egl_la_CFLAGS += -DDEBUG
 endif
@@ -45,7 +45,7 @@ if WANT_DEBUG
 libwayland_egl_la_CFLAGS += -ggdb -O0
 endif
 
-libwayland_egl_la_CXXFLAGS = -I. -I$(top_srcdir)/include -I$(top_srcdir)/include/android $(WAYLAND_CLIENT_CFLAGS) $(WAYLAND_SERVER_CFLAGS)
+libwayland_egl_la_CXXFLAGS = -I. -I$(top_srcdir)/include $(ANDROID_HEADERS_CFLAGS) $(WAYLAND_CLIENT_CFLAGS) $(WAYLAND_SERVER_CFLAGS)
 if WANT_TRACE
 libwayland_egl_la_CXXFLAGS += -DDEBUG
 endif
@@ -57,9 +57,9 @@ libwayland_egl_la_LDFLAGS = \
 
 endif
 
-libhybris_eglplatformcommon_la_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/android -I$(top_srcdir)/egl -I$(top_srcdir)/common/
+libhybris_eglplatformcommon_la_CFLAGS = -I$(top_srcdir)/include $(ANDROID_HEADERS_CFLAGS) -I$(top_srcdir)/egl -I$(top_srcdir)/common/
 if WANT_WAYLAND
-libhybris_eglplatformcommon_la_CFLAGS += $(WAYLAND_CLIENT_CFLAGS) $(WAYLAND_SERVER_CFLAGS) -I$(top_srcdir)/include/android
+libhybris_eglplatformcommon_la_CFLAGS += $(WAYLAND_CLIENT_CFLAGS) $(WAYLAND_SERVER_CFLAGS) $(ANDROID_HEADERS_CFLAGS)
 endif
 
 if WANT_MESA
@@ -73,13 +73,13 @@ libhybris_eglplatformcommon_la_CFLAGS += -ggdb -O0
 endif
 
 
-libhybris_eglplatformcommon_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/egl -I$(top_srcdir)/include/android -I$(top_srcdir)/common/
+libhybris_eglplatformcommon_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/egl $(ANDROID_HEADERS_CFLAGS) -I$(top_srcdir)/common/
 if WANT_MESA
 libhybris_eglplatformcommon_la_CXXFLAGS += -DLIBHYBRIS_WANTS_MESA_X11_HEADERS
 endif
 
 if WANT_WAYLAND
-libhybris_eglplatformcommon_la_CXXFLAGS += $(WAYLAND_CLIENT_CFLAGS) $(WAYLAND_SERVER_CFLAGS) -I$(top_srcdir)/include/android
+libhybris_eglplatformcommon_la_CXXFLAGS += $(WAYLAND_CLIENT_CFLAGS) $(WAYLAND_SERVER_CFLAGS) $(ANDROID_HEADERS_CFLAGS)
 endif
 
 if WANT_TRACE
@@ -92,6 +92,15 @@ libhybris_eglplatformcommon_la_LDFLAGS = \
 	$(top_builddir)/common/libhybris-common.la \
 	-version-info "1":"0":"0"
 
+if HAS_ANDROID_4_2_0
+libhybris_eglplatformcommon_la_LDFLAGS += $(top_builddir)/libsync/libsync.la
+endif
+
+if HAS_ANDROID_5_0_0
+libhybris_eglplatformcommon_la_LDFLAGS += $(top_builddir)/libsync/libsync.la
+endif
+
+
 eglplatformcommondir = $(includedir)/hybris/eglplatformcommon
 eglplatformcommon_HEADERS = \
 	support.h \
diff --git a/hybris/egl/platforms/common/eglplatformcommon.cpp b/hybris/egl/platforms/common/eglplatformcommon.cpp
index 4878379..a6c0076 100644
--- a/hybris/egl/platforms/common/eglplatformcommon.cpp
+++ b/hybris/egl/platforms/common/eglplatformcommon.cpp
@@ -1,8 +1,9 @@
+#include <android-config.h>
 #include <ws.h>
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <string.h>
-#include <android/hardware/gralloc.h>
+#include <hardware/gralloc.h>
 #include <stdio.h>
 #include <assert.h>
 #include "config.h"
@@ -21,15 +22,32 @@
 
 #include "windowbuffer.h"
 
+static struct ws_egl_interface *my_egl_interface;
 static gralloc_module_t *my_gralloc = 0;
 static alloc_device_t *my_alloc = 0;
 
-extern "C" void eglplatformcommon_init(gralloc_module_t *gralloc, alloc_device_t *allocdevice)
+extern "C" void eglplatformcommon_init(struct ws_egl_interface *egl_iface, gralloc_module_t *gralloc, alloc_device_t *allocdevice)
 {
+	my_egl_interface = egl_iface;
 	my_gralloc = gralloc;
 	my_alloc = allocdevice;
 }
 
+extern "C" void *hybris_android_egl_dlsym(const char *symbol)
+{
+	return (*my_egl_interface->android_egl_dlsym)(symbol);
+}
+
+extern "C" int hybris_egl_has_mapping(EGLSurface surface)
+{
+	return (*my_egl_interface->has_mapping)(surface);
+}
+
+EGLNativeWindowType hybris_egl_get_mapping(EGLSurface surface)
+{
+	return (*my_egl_interface->get_mapping)(surface);
+}
+
 extern "C" int hybris_register_buffer_handle(buffer_handle_t handle)
 {
 	if (!my_gralloc)
@@ -64,6 +82,8 @@ extern "C" void hybris_dump_buffer_to_file(ANativeWindowBuffer *buf)
 	snprintf(b, 1020, "vaddr.%p.%p.%i.%is%ix%ix%i", buf, vaddr, cnt, buf->width, buf->stride, buf->height, bytes_pp);
 	cnt++;
 	int fd = ::open(b, O_WRONLY|O_CREAT, S_IRWXU);
+	if(fd < 0)
+		return;
 
 	::write(fd, vaddr, buf->stride * buf->height * bytes_pp);
 	::close(fd);
@@ -75,7 +95,7 @@ extern "C" void hybris_dump_buffer_to_file(ANativeWindowBuffer *buf)
 extern "C" EGLBoolean eglplatformcommon_eglBindWaylandDisplayWL(EGLDisplay dpy, struct wl_display *display)
 {
 	assert(my_gralloc != NULL);
-	server_wlegl_create(display, my_gralloc);
+	server_wlegl_create(display, my_gralloc, my_alloc);
 	return EGL_TRUE;
 }
 
@@ -85,7 +105,7 @@ extern "C" EGLBoolean eglplatformcommon_eglUnbindWaylandDisplayWL(EGLDisplay dpy
 }
 
 extern "C" EGLBoolean eglplatformcommon_eglQueryWaylandBufferWL(EGLDisplay dpy,
-	struct wl_buffer *buffer, EGLint attribute, EGLint *value)
+	struct wl_resource *buffer, EGLint attribute, EGLint *value)
 {
 	server_wlegl_buffer *buf  = server_wlegl_buffer_from(buffer);
 	ANativeWindowBuffer* anwb = (ANativeWindowBuffer *) buf->buf;
@@ -114,8 +134,73 @@ extern "C" EGLBoolean eglplatformcommon_eglQueryWaylandBufferWL(EGLDisplay dpy,
 	return EGL_FALSE ;
 }
 
+// Added as part of EGL_HYBRIS_WL_acquire_native_buffer. Buffers are released
+// and decRef'ed using eglHybrisReleaseNativeBuffer
+extern "C" EGLBoolean eglplatformcommon_eglHybrisAcquireNativeBufferWL(EGLDisplay dpy, struct wl_resource *wlBuffer, EGLClientBuffer *buffer)
+ {
+     if (!buffer)
+         return EGL_FALSE;
+    server_wlegl_buffer *buf  = server_wlegl_buffer_from(wlBuffer);
+    if (!buf->buf->isAllocated()) {
+        // We only return the handles from buffers which are allocated server side. This is because some
+        // hardware compositors have problems with client-side allocated buffers.
+        buffer = 0;
+        return EGL_FALSE;
+    }
+    ANativeWindowBuffer* anwb = (ANativeWindowBuffer *) buf->buf;
+    anwb->common.incRef(&anwb->common);
+    *buffer = (EGLClientBuffer *) anwb;
+    return EGL_TRUE;
+}
+
 #endif
 
+// Added as part of EGL_HYBRIS_native_buffer2
+extern "C" EGLBoolean eglplatformcommon_eglHybrisNativeBufferHandle(EGLDisplay dpy, EGLClientBuffer buffer, void **handle)
+{
+	if (!buffer || !handle)
+		return EGL_FALSE;
+	ANativeWindowBuffer *anwb = (ANativeWindowBuffer *) buffer;
+	*handle = (void *) anwb->handle;
+	return EGL_TRUE;
+}
+
+extern "C" void eglplatformcommon_eglHybrisGetNativeBufferInfo(EGLClientBuffer buffer, int *num_ints, int *num_fds)
+{
+	RemoteWindowBuffer *buf = static_cast<RemoteWindowBuffer *>((ANativeWindowBuffer *) buffer);
+	*num_ints = buf->handle->numInts;
+	*num_fds = buf->handle->numFds;
+}
+
+extern "C" void eglplatformcommon_eglHybrisSerializeNativeBuffer(EGLClientBuffer buffer, int *ints, int *fds)
+{
+	RemoteWindowBuffer *buf = static_cast<RemoteWindowBuffer *>((ANativeWindowBuffer *) buffer);
+	memcpy(ints, buf->handle->data + buf->handle->numFds, buf->handle->numInts * sizeof(int));
+	memcpy(fds, buf->handle->data, buf->handle->numFds * sizeof(int));
+}
+
+extern "C" EGLBoolean eglplatformcommon_eglHybrisCreateRemoteBuffer(EGLint width, EGLint height, EGLint usage, EGLint format, EGLint stride,
+                                                                    int num_ints, int *ints, int num_fds, int *fds, EGLClientBuffer *buffer)
+{
+	assert(my_gralloc != NULL);
+
+	native_handle_t *native = native_handle_create(num_fds, num_ints);
+	memcpy(&native->data[0], fds, num_fds * sizeof(int));
+	memcpy(&native->data[num_fds], ints, num_ints * sizeof(int));
+
+	int ret = my_gralloc->registerBuffer(my_gralloc, (buffer_handle_t)native);
+
+	if (ret == 0)
+	{
+	        RemoteWindowBuffer *buf = new RemoteWindowBuffer(width, height, stride, format, usage, (buffer_handle_t)native, my_gralloc, my_alloc);
+		buf->common.incRef(&buf->common);
+		*buffer = (EGLClientBuffer) static_cast<ANativeWindowBuffer *>(buf);
+		return EGL_TRUE;
+	}
+	else
+		return EGL_FALSE;
+}
+
 extern "C" EGLBoolean eglplatformcommon_eglHybrisCreateNativeBuffer(EGLint width, EGLint height, EGLint usage, EGLint format, EGLint *stride, EGLClientBuffer *buffer)
 {
 	int ret;
@@ -129,8 +214,9 @@ extern "C" EGLBoolean eglplatformcommon_eglHybrisCreateNativeBuffer(EGLint width
 
 	if (ret == 0)
 	{
-		RemoteWindowBuffer *buf = new RemoteWindowBuffer(width, height, _stride, format, usage, _handle, my_gralloc);
+	        RemoteWindowBuffer *buf = new RemoteWindowBuffer(width, height, _stride, format, usage, _handle, my_gralloc, my_alloc);
 		buf->common.incRef(&buf->common);
+		buf->setAllocated(true);
 		*buffer = (EGLClientBuffer) static_cast<ANativeWindowBuffer *>(buf);
 		*stride = _stride;
 		return EGL_TRUE;
@@ -185,9 +271,9 @@ eglplatformcommon_passthroughImageKHR(EGLContext *ctx, EGLenum *target, EGLClien
 	static int debugenvchecked = 0;
 	if (*target == EGL_WAYLAND_BUFFER_WL)
 	{
-		server_wlegl_buffer *buf = server_wlegl_buffer_from((struct wl_buffer *)*buffer);
-		HYBRIS_TRACE_BEGIN("eglplatformcommon", "Wayland_eglImageKHR", "-resource@%i", ((struct wl_buffer *)*buffer)->resource.object.id);
-		HYBRIS_TRACE_END("eglplatformcommon", "Wayland_eglImageKHR", "-resource@%i", ((struct wl_buffer *)*buffer)->resource.object.id);
+		server_wlegl_buffer *buf = server_wlegl_buffer_from((struct wl_resource *)*buffer);
+		HYBRIS_TRACE_BEGIN("eglplatformcommon", "Wayland_eglImageKHR", "-resource@%i", wl_resource_get_id((struct wl_resource *)*buffer));
+		HYBRIS_TRACE_END("eglplatformcommon", "Wayland_eglImageKHR", "-resource@%i", wl_resource_get_id((struct wl_resource *)*buffer));
 		if (debugenvchecked == 0)
 		{
 			if (getenv("HYBRIS_WAYLAND_KHR_DUMP_BUFFERS") != NULL)
@@ -223,6 +309,11 @@ extern "C" __eglMustCastToProperFunctionPointerType eglplatformcommon_eglGetProc
 		return (__eglMustCastToProperFunctionPointerType)eglplatformcommon_eglQueryWaylandBufferWL;
 	}
 	else
+    if (strcmp(procname, "eglHybrisAcquireNativeBufferWL") == 0)
+    {
+        return (__eglMustCastToProperFunctionPointerType) eglplatformcommon_eglHybrisAcquireNativeBufferWL;
+    }
+    else
 #endif
 	if (strcmp(procname, "eglHybrisCreateNativeBuffer") == 0)
 	{
@@ -243,6 +334,26 @@ extern "C" __eglMustCastToProperFunctionPointerType eglplatformcommon_eglGetProc
 	{
 		return (__eglMustCastToProperFunctionPointerType)eglplatformcommon_eglHybrisReleaseNativeBuffer;
 	}
+	else
+	if (strcmp(procname, "eglHybrisGetNativeBufferInfo") == 0)
+	{
+		return (__eglMustCastToProperFunctionPointerType)eglplatformcommon_eglHybrisGetNativeBufferInfo;
+	}
+	else
+	if (strcmp(procname, "eglHybrisSerializeNativeBuffer") == 0)
+	{
+		return (__eglMustCastToProperFunctionPointerType)eglplatformcommon_eglHybrisSerializeNativeBuffer;
+	}
+	else
+	if (strcmp(procname, "eglHybrisCreateRemoteBuffer") == 0)
+	{
+		return (__eglMustCastToProperFunctionPointerType)eglplatformcommon_eglHybrisCreateRemoteBuffer;
+	}
+	else
+	if (strcmp(procname, "eglHybrisNativeBufferHandle") == 0)
+	{
+		return (__eglMustCastToProperFunctionPointerType)eglplatformcommon_eglHybrisNativeBufferHandle;
+	}
 	return NULL;
 }
 
@@ -253,8 +364,7 @@ extern "C" const char *eglplatformcommon_eglQueryString(EGLDisplay dpy, EGLint n
 	{
 		const char *ret = (*real_eglQueryString)(dpy, name);
 		static char eglextensionsbuf[512];
-		assert(ret != NULL);
-		snprintf(eglextensionsbuf, 510, "%sEGL_HYBRIS_native_buffer %s", ret,
+		snprintf(eglextensionsbuf, 510, "%sEGL_HYBRIS_native_buffer2 EGL_HYBRIS_WL_acquire_native_buffer %s", ret ? ret : "",
 #ifdef WANT_WAYLAND
 			"EGL_WL_bind_wayland_display "
 #else
diff --git a/hybris/egl/platforms/common/eglplatformcommon.h b/hybris/egl/platforms/common/eglplatformcommon.h
index 273817f..aec29db 100644
--- a/hybris/egl/platforms/common/eglplatformcommon.h
+++ b/hybris/egl/platforms/common/eglplatformcommon.h
@@ -1,10 +1,10 @@
 #ifndef __EGLPLATFORMCOMMON_H
 #define __EGLPLATFORMCOMMON_H
 #include <string.h>
-#include <android/hardware/gralloc.h>
+#include <hardware/gralloc.h>
 #include <EGL/egl.h>
 
-void eglplatformcommon_init(gralloc_module_t *gralloc, alloc_device_t *allocdevice);
+void eglplatformcommon_init(struct ws_egl_interface *egl_iface, gralloc_module_t *gralloc, alloc_device_t *allocdevice);
 __eglMustCastToProperFunctionPointerType eglplatformcommon_eglGetProcAddress(const char *procname);
 void eglplatformcommon_passthroughImageKHR(EGLContext *ctx, EGLenum *target, EGLClientBuffer *buffer, const EGLint **attrib_list);
 const char *eglplatformcommon_eglQueryString(EGLDisplay dpy, EGLint name, const char *(*real_eglQueryString)(EGLDisplay dpy, EGLint name));
diff --git a/hybris/egl/platforms/common/hybris_nativebufferext.h b/hybris/egl/platforms/common/hybris_nativebufferext.h
index 0724753..1fac17b 100644
--- a/hybris/egl/platforms/common/hybris_nativebufferext.h
+++ b/hybris/egl/platforms/common/hybris_nativebufferext.h
@@ -24,6 +24,12 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISLOCKNATIVEBUFFERPROC)(EGLClientBuff
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISUNLOCKNATIVEBUFFERPROC)(EGLClientBuffer buffer);
 typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISRELEASENATIVEBUFFERPROC)(EGLClientBuffer buffer);
 
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISGETNATIVEBUFFERINFOPROC)(EGLClientBuffer buffer, int *num_ints, int *num_fds);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISSERIALIZENATIVEBUFFERPROC)(EGLClientBuffer buffer, int *ints, int *fds);
+
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLHYBRISCREATEREMOTEBUFFERPROC)(EGLint width, EGLint height, EGLint usage, EGLint format, EGLint stride,
+                                                                     int num_ints, int *ints, int num_fds, int *fds, EGLClientBuffer *buffer);
+
 enum {
     /* buffer is never read in software */
     HYBRIS_USAGE_SW_READ_NEVER         = 0x00000000,
diff --git a/hybris/egl/platforms/common/native_handle.c b/hybris/egl/platforms/common/native_handle.c
index c219c71..16ca2d6 100644
--- a/hybris/egl/platforms/common/native_handle.c
+++ b/hybris/egl/platforms/common/native_handle.c
@@ -16,13 +16,14 @@
 
 #define LOG_TAG "NativeHandle"
 
+#include <android-config.h>
 #include <stdint.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <android/cutils/native_handle.h>
+#include <cutils/native_handle.h>
 
 native_handle_t* native_handle_create(int numFds, int numInts)
 {
diff --git a/hybris/egl/platforms/common/nativewindowbase.cpp b/hybris/egl/platforms/common/nativewindowbase.cpp
index f6ec979..c028c35 100644
--- a/hybris/egl/platforms/common/nativewindowbase.cpp
+++ b/hybris/egl/platforms/common/nativewindowbase.cpp
@@ -1,17 +1,25 @@
+#include <android-config.h>
 #include <string.h>
-#include <android/system/window.h>
-#include <android/hardware/gralloc.h>
+#include <system/window.h>
+#include <hardware/gralloc.h>
 #include "support.h"
 #include <stdarg.h>
 
+#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2 || ANDROID_VERSION_MAJOR>=5
+extern "C" {
+#include <sync/sync.h>
+}
+#endif
+
+
 #include "nativewindowbase.h"
 
 #include "logging.h"
 
-#include <android/android-version.h>
-
 #define TRACE(message, ...) HYBRIS_DEBUG_LOG(EGL, message, ##__VA_ARGS__)
 
+
+
 BaseNativeWindowBuffer::BaseNativeWindowBuffer()
 {
 	TRACE("%p", this);
@@ -91,7 +99,7 @@ BaseNativeWindow::BaseNativeWindow()
 
 	ANativeWindow::setSwapInterval = _setSwapInterval;
 
-#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2
+#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2 || ANDROID_VERSION_MAJOR>=5
 	ANativeWindow::lockBuffer_DEPRECATED = &_lockBuffer_DEPRECATED;
 	ANativeWindow::dequeueBuffer_DEPRECATED = &_dequeueBuffer_DEPRECATED;
 	ANativeWindow::queueBuffer_DEPRECATED = &_queueBuffer_DEPRECATED;
@@ -153,7 +161,17 @@ int BaseNativeWindow::_dequeueBuffer_DEPRECATED(ANativeWindow* window, ANativeWi
 	BaseNativeWindowBuffer* temp = static_cast<BaseNativeWindowBuffer*>(*buffer);
 	int fenceFd = -1;
 	int ret = static_cast<BaseNativeWindow*>(window)->dequeueBuffer(&temp, &fenceFd);
+
 	*buffer = static_cast<ANativeWindowBuffer*>(temp);
+
+#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2 || ANDROID_VERSION_MAJOR>=5
+	if (fenceFd >= 0)
+	{
+		sync_wait(fenceFd, -1);
+		close(fenceFd);
+	}
+#endif
+
 	return ret;
 }
 
@@ -239,7 +257,7 @@ const char *BaseNativeWindow::_native_query_operation(int what)
 		case NATIVE_WINDOW_DEFAULT_WIDTH: return "NATIVE_WINDOW_DEFAULT_WIDTH";
 		case NATIVE_WINDOW_DEFAULT_HEIGHT: return "NATIVE_WINDOW_DEFAULT_HEIGHT";
 		case NATIVE_WINDOW_TRANSFORM_HINT: return "NATIVE_WINDOW_TRANSFORM_HINT";
-#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=1
+#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=1 || ANDROID_VERSION_MAJOR>=5
 		case NATIVE_WINDOW_CONSUMER_RUNNING_BEHIND: return "NATIVE_WINDOW_CONSUMER_RUNNING_BEHIND";
 #endif
 		default: return "NATIVE_UNKNOWN_QUERY";
@@ -353,7 +371,7 @@ int BaseNativeWindow::_perform(struct ANativeWindow* window, int operation, ... 
 	case NATIVE_WINDOW_API_DISCONNECT            : // 14,   /* private */
 		TRACE("api disconnect");
 		break;
-#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=1
+#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=1 || ANDROID_VERSION_MAJOR>=5
 	case NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS : // 15, /* private */
 		TRACE("set buffers user dimensions");
 		break;
diff --git a/hybris/egl/platforms/common/nativewindowbase.h b/hybris/egl/platforms/common/nativewindowbase.h
index fadb123..247575a 100644
--- a/hybris/egl/platforms/common/nativewindowbase.h
+++ b/hybris/egl/platforms/common/nativewindowbase.h
@@ -3,7 +3,7 @@
 
 /* for ICS window.h */
 #include <string.h>
-#include <android/system/window.h>
+#include <system/window.h>
 #include <EGL/egl.h>
 #include "support.h"
 #include <stdarg.h>
diff --git a/hybris/egl/platforms/common/server_wlegl.cpp b/hybris/egl/platforms/common/server_wlegl.cpp
index c2d3ef8..7db9747 100644
--- a/hybris/egl/platforms/common/server_wlegl.cpp
+++ b/hybris/egl/platforms/common/server_wlegl.cpp
@@ -20,6 +20,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <android-config.h>
 #include <cstring>
 
 #include <EGL/egl.h>
@@ -39,7 +40,7 @@ extern "C" {
 static inline server_wlegl *
 server_wlegl_from(struct wl_resource *resource)
 {
-	return reinterpret_cast<server_wlegl *>(resource->data);
+	return reinterpret_cast<server_wlegl *>(wl_resource_get_user_data(resource));
 }
 
 static void
@@ -97,7 +98,7 @@ server_wlegl_create_buffer(struct wl_client *client,
 		return;
 	}
 
-	buffer = server_wlegl_buffer_create(id, width, height, stride,
+	buffer = server_wlegl_buffer_create(client, id, width, height, stride,
 					    format, usage, native, wlegl);
 	if (!buffer) {
 		native_handle_close((native_handle_t *)native);
@@ -107,13 +108,49 @@ server_wlegl_create_buffer(struct wl_client *client,
 				       "invalid native handle");
 		return;
 	}
+}
+
+static void
+server_wlegl_get_server_buffer_handle(wl_client *client, wl_resource *res, uint32_t id, int32_t width, int32_t height, int32_t format, int32_t usage)
+{
+	if (width == 0 || height == 0) {
+		wl_resource_post_error(res, 0, "invalid buffer size: %u,%u\n", width, height);
+		return;
+	}
+
+	server_wlegl *wlegl = server_wlegl_from(res);
+
+	wl_resource *resource = wl_resource_create(client, &android_wlegl_server_buffer_handle_interface, wl_resource_get_version(res), id);
+
+	buffer_handle_t _handle;
+	int _stride;
+
+	usage |= GRALLOC_USAGE_HW_COMPOSER;
+
+	int ret = wlegl->alloc->alloc(wlegl->alloc, width, height, format, usage, &_handle, &_stride);
+	server_wlegl_buffer *buffer = server_wlegl_buffer_create_server(client, width, height, _stride, format, usage, _handle, wlegl);
+
+	struct wl_array ints;
+	int *ints_data;
+	wl_array_init(&ints);
+	ints_data = (int*) wl_array_add(&ints, _handle->numInts * sizeof(int));
+	memcpy(ints_data, _handle->data + _handle->numFds, _handle->numInts * sizeof(int));
+
+	android_wlegl_server_buffer_handle_send_buffer_ints(resource, &ints);
+	wl_array_release(&ints);
+
+	for (int i = 0; i < _handle->numFds; i++) {
+		android_wlegl_server_buffer_handle_send_buffer_fd(resource, _handle->data[i]);
+	}
 
-	wl_client_add_resource(client, &buffer->base.resource);
+	android_wlegl_server_buffer_handle_send_buffer(resource, buffer->resource, format, _stride);
+	wl_resource_destroy(resource);
 }
 
 static const struct android_wlegl_interface server_wlegl_impl = {
 	server_wlegl_create_handle,
 	server_wlegl_create_buffer,
+	server_wlegl_get_server_buffer_handle,
 };
 
 static void
@@ -123,12 +160,12 @@ server_wlegl_bind(struct wl_client *client, void *data,
 	server_wlegl *wlegl = reinterpret_cast<server_wlegl *>(data);
 	struct wl_resource *resource;
 
-	resource = wl_client_add_object(client, &android_wlegl_interface,
-					&server_wlegl_impl, id, wlegl);
+	resource = wl_resource_create(client, &android_wlegl_interface, version, id);
+	wl_resource_set_implementation(resource, &server_wlegl_impl, wlegl, 0);
 }
 
 server_wlegl *
-server_wlegl_create(struct wl_display *display, gralloc_module_t *gralloc)
+server_wlegl_create(struct wl_display *display, gralloc_module_t *gralloc, alloc_device_t *alloc)
 {
 	struct server_wlegl *wlegl;
 	int ret;
@@ -136,10 +173,10 @@ server_wlegl_create(struct wl_display *display, gralloc_module_t *gralloc)
 	wlegl = new server_wlegl;
 
 	wlegl->display = display;
-	wlegl->global = wl_display_add_global(display,
-					      &android_wlegl_interface,
+	wlegl->global = wl_global_create(display, &android_wlegl_interface, 2,
 					      wlegl, server_wlegl_bind);
 	wlegl->gralloc = (const gralloc_module_t *)gralloc;
+	wlegl->alloc = alloc;
 
 	return wlegl;
 }
diff --git a/hybris/egl/platforms/common/server_wlegl.h b/hybris/egl/platforms/common/server_wlegl.h
index 4a26218..c5ae73e 100644
--- a/hybris/egl/platforms/common/server_wlegl.h
+++ b/hybris/egl/platforms/common/server_wlegl.h
@@ -37,14 +37,9 @@ struct wl_buffer;
 struct server_wlegl;
 
 server_wlegl *
-server_wlegl_create(struct wl_display *wldpy, gralloc_module_t *gralloc);
+server_wlegl_create(struct wl_display *wldpy, gralloc_module_t *gralloc, alloc_device_t *alloc);
 
 void
 server_wlegl_destroy(server_wlegl *wlegl);
 
-EGLImageKHR
-egl_create_image_wl(EGLDisplay egldisplay,
-		    struct wl_buffer *user_buffer,
-		    const EGLint *attrib_list);
-
 #endif /* SERVER_WLEGL_H */
diff --git a/hybris/egl/platforms/common/server_wlegl_buffer.cpp b/hybris/egl/platforms/common/server_wlegl_buffer.cpp
index dd8e08d..4767f6b 100644
--- a/hybris/egl/platforms/common/server_wlegl_buffer.cpp
+++ b/hybris/egl/platforms/common/server_wlegl_buffer.cpp
@@ -20,6 +20,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <android-config.h>
 #include <cstring>
 #include <cassert>
 
@@ -37,27 +38,22 @@ static const struct wl_buffer_interface server_wlegl_buffer_impl = {
 };
 
 server_wlegl_buffer *
-server_wlegl_buffer_from(struct wl_buffer *buffer)
+server_wlegl_buffer_from(struct wl_resource *buffer)
 {
-	if (buffer->resource.object.implementation !=
-	    (void (**)(void)) &server_wlegl_buffer_impl)
-		return NULL;
-
-	return container_of(buffer, server_wlegl_buffer, base);
+	return static_cast<server_wlegl_buffer *>(wl_resource_get_user_data(buffer));
 }
 
 static void
 server_wlegl_buffer_dtor(struct wl_resource *resource)
 {
-	struct wl_buffer *base =
-		reinterpret_cast<struct wl_buffer*>(resource->data);
-	server_wlegl_buffer *buffer = server_wlegl_buffer_from(base);
+	server_wlegl_buffer *buffer = server_wlegl_buffer_from(resource);
 	buffer->buf->common.decRef(&buffer->buf->common);
 	delete buffer;
 }
 
 server_wlegl_buffer *
-server_wlegl_buffer_create(uint32_t id,
+server_wlegl_buffer_create(wl_client *client,
+			   uint32_t id,
 			   int32_t width,
 			   int32_t height,
 			   int32_t stride,
@@ -69,29 +65,42 @@ server_wlegl_buffer_create(uint32_t id,
 	server_wlegl_buffer *buffer = new server_wlegl_buffer;
 	int ret;
 
-	memset(buffer, 0, sizeof(*buffer));
-
 	buffer->wlegl = wlegl;
-
-	buffer->base.resource.object.id = id;
-	buffer->base.resource.object.interface = &wl_buffer_interface;
-	buffer->base.resource.object.implementation =
-		(void (**)(void)) &server_wlegl_buffer_impl;
-
-	buffer->base.resource.data = &buffer->base;
-	buffer->base.resource.destroy = server_wlegl_buffer_dtor;
-
-	buffer->base.width = width;
-	buffer->base.height = height;
+	buffer->resource = wl_resource_create(client, &wl_buffer_interface, 1, id);
+	wl_resource_set_implementation(buffer->resource, &server_wlegl_buffer_impl, buffer, server_wlegl_buffer_dtor);
 
 	ret = wlegl->gralloc->registerBuffer(wlegl->gralloc, handle);
 	if (ret) {
 		delete buffer;
 		return NULL;
 	}
-        
+
+	buffer->buf = new RemoteWindowBuffer(
+	        width, height, stride, format, usage, handle, wlegl->gralloc, NULL);
+	buffer->buf->common.incRef(&buffer->buf->common);
+	return buffer;
+}
+
+server_wlegl_buffer *
+server_wlegl_buffer_create_server(wl_client *client,
+			   int32_t width,
+			   int32_t height,
+			   int32_t stride,
+			   int32_t format,
+			   int32_t usage,
+			   buffer_handle_t handle,
+			   server_wlegl *wlegl)
+{
+	server_wlegl_buffer *buffer = new server_wlegl_buffer;
+	int ret;
+
+	buffer->wlegl = wlegl;
+	buffer->resource = wl_resource_create(client, &wl_buffer_interface, 1, 0);
+	wl_resource_set_implementation(buffer->resource, &server_wlegl_buffer_impl, buffer, server_wlegl_buffer_dtor);
+
 	buffer->buf = new RemoteWindowBuffer(
-		width, height, stride, format, usage, handle, wlegl->gralloc);
+	        width, height, stride, format, usage, handle, wlegl->gralloc, wlegl->alloc);
+	buffer->buf->setAllocated(true);
 	buffer->buf->common.incRef(&buffer->buf->common);
 	return buffer;
 }
diff --git a/hybris/egl/platforms/common/server_wlegl_buffer.h b/hybris/egl/platforms/common/server_wlegl_buffer.h
index 67b42e4..9e86719 100644
--- a/hybris/egl/platforms/common/server_wlegl_buffer.h
+++ b/hybris/egl/platforms/common/server_wlegl_buffer.h
@@ -33,18 +33,23 @@
 struct server_wlegl;
 
 struct server_wlegl_buffer {
-	struct wl_buffer base;
+	struct wl_resource *resource;
 	server_wlegl *wlegl;
 
 	RemoteWindowBuffer *buf;
 };
 
 server_wlegl_buffer *
-server_wlegl_buffer_create(uint32_t id, int32_t width, int32_t height,
+server_wlegl_buffer_create(wl_client *client, uint32_t id, int32_t width, int32_t height,
 			   int32_t stride, int32_t format, int32_t usage,
 			   buffer_handle_t handle, server_wlegl *wlegl);
 
 server_wlegl_buffer *
-server_wlegl_buffer_from(struct wl_buffer *);
+server_wlegl_buffer_create_server(wl_client *client, int32_t width, int32_t height,
+			   int32_t stride, int32_t format, int32_t usage,
+			   buffer_handle_t handle, server_wlegl *wlegl);
+
+server_wlegl_buffer *
+server_wlegl_buffer_from(struct wl_resource *);
 
 #endif /* SERVER_WLEGL_BUFFER_H */
diff --git a/hybris/egl/platforms/common/server_wlegl_handle.cpp b/hybris/egl/platforms/common/server_wlegl_handle.cpp
index fcac8f3..04ad085 100644
--- a/hybris/egl/platforms/common/server_wlegl_handle.cpp
+++ b/hybris/egl/platforms/common/server_wlegl_handle.cpp
@@ -20,6 +20,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <android-config.h>
 #include <stdint.h>
 #include <cstring>
 #include <unistd.h>
diff --git a/hybris/egl/platforms/common/server_wlegl_private.h b/hybris/egl/platforms/common/server_wlegl_private.h
index 0e19f0c..b0a1397 100644
--- a/hybris/egl/platforms/common/server_wlegl_private.h
+++ b/hybris/egl/platforms/common/server_wlegl_private.h
@@ -34,6 +34,7 @@ struct server_wlegl {
 	struct wl_global *global;
 
 	const gralloc_module_t *gralloc;
+        alloc_device_t *alloc;
 };
 
 #endif /* SERVER_WLEGL_PRIVATE_H */
diff --git a/hybris/egl/platforms/common/wayland-android-client-protocol.h b/hybris/egl/platforms/common/wayland-android-client-protocol.h
deleted file mode 100644
index 822eb7b..0000000
--- a/hybris/egl/platforms/common/wayland-android-client-protocol.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* 
- * Copyright © 2012 Collabora, Ltd.
- * 
- * Permission to use, copy, modify, distribute, and sell this
- * software and its documentation for any purpose is hereby granted
- * without fee, provided that the above copyright notice appear in
- * all copies and that both that copyright notice and this permission
- * notice appear in supporting documentation, and that the name of
- * the copyright holders not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- * THIS SOFTWARE.
- */
-
-#ifndef ANDROID_CLIENT_PROTOCOL_H
-#define ANDROID_CLIENT_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-client.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct android_wlegl;
-struct android_wlegl_handle;
-
-extern const struct wl_interface android_wlegl_interface;
-extern const struct wl_interface android_wlegl_handle_interface;
-
-#ifndef ANDROID_WLEGL_ERROR_ENUM
-#define ANDROID_WLEGL_ERROR_ENUM
-enum android_wlegl_error {
-	ANDROID_WLEGL_ERROR_BAD_HANDLE = 0,
-	ANDROID_WLEGL_ERROR_BAD_VALUE = 1,
-};
-#endif /* ANDROID_WLEGL_ERROR_ENUM */
-
-#define ANDROID_WLEGL_CREATE_HANDLE	0
-#define ANDROID_WLEGL_CREATE_BUFFER	1
-
-static inline void
-android_wlegl_set_user_data(struct android_wlegl *android_wlegl, void *user_data)
-{
-	wl_proxy_set_user_data((struct wl_proxy *) android_wlegl, user_data);
-}
-
-static inline void *
-android_wlegl_get_user_data(struct android_wlegl *android_wlegl)
-{
-	return wl_proxy_get_user_data((struct wl_proxy *) android_wlegl);
-}
-
-static inline void
-android_wlegl_destroy(struct android_wlegl *android_wlegl)
-{
-	wl_proxy_destroy((struct wl_proxy *) android_wlegl);
-}
-
-static inline struct android_wlegl_handle *
-android_wlegl_create_handle(struct android_wlegl *android_wlegl, int32_t num_fds, struct wl_array *ints)
-{
-	struct wl_proxy *id;
-
-	id = wl_proxy_create((struct wl_proxy *) android_wlegl,
-			     &android_wlegl_handle_interface);
-	if (!id)
-		return NULL;
-
-	wl_proxy_marshal((struct wl_proxy *) android_wlegl,
-			 ANDROID_WLEGL_CREATE_HANDLE, id, num_fds, ints);
-
-	return (struct android_wlegl_handle *) id;
-}
-
-static inline struct wl_buffer *
-android_wlegl_create_buffer(struct android_wlegl *android_wlegl, int32_t width, int32_t height, int32_t stride, int32_t format, int32_t usage, struct android_wlegl_handle *native_handle)
-{
-	struct wl_proxy *id;
-
-	id = wl_proxy_create((struct wl_proxy *) android_wlegl,
-			     &wl_buffer_interface);
-	if (!id)
-		return NULL;
-
-	wl_proxy_marshal((struct wl_proxy *) android_wlegl,
-			 ANDROID_WLEGL_CREATE_BUFFER, id, width, height, stride, format, usage, native_handle);
-
-	return (struct wl_buffer *) id;
-}
-
-#ifndef ANDROID_WLEGL_HANDLE_ERROR_ENUM
-#define ANDROID_WLEGL_HANDLE_ERROR_ENUM
-enum android_wlegl_handle_error {
-	ANDROID_WLEGL_HANDLE_ERROR_TOO_MANY_FDS = 0,
-};
-#endif /* ANDROID_WLEGL_HANDLE_ERROR_ENUM */
-
-#define ANDROID_WLEGL_HANDLE_ADD_FD	0
-#define ANDROID_WLEGL_HANDLE_DESTROY	1
-
-static inline void
-android_wlegl_handle_set_user_data(struct android_wlegl_handle *android_wlegl_handle, void *user_data)
-{
-	wl_proxy_set_user_data((struct wl_proxy *) android_wlegl_handle, user_data);
-}
-
-static inline void *
-android_wlegl_handle_get_user_data(struct android_wlegl_handle *android_wlegl_handle)
-{
-	return wl_proxy_get_user_data((struct wl_proxy *) android_wlegl_handle);
-}
-
-static inline void
-android_wlegl_handle_add_fd(struct android_wlegl_handle *android_wlegl_handle, int32_t fd)
-{
-	wl_proxy_marshal((struct wl_proxy *) android_wlegl_handle,
-			 ANDROID_WLEGL_HANDLE_ADD_FD, fd);
-}
-
-static inline void
-android_wlegl_handle_destroy(struct android_wlegl_handle *android_wlegl_handle)
-{
-	wl_proxy_marshal((struct wl_proxy *) android_wlegl_handle,
-			 ANDROID_WLEGL_HANDLE_DESTROY);
-
-	wl_proxy_destroy((struct wl_proxy *) android_wlegl_handle);
-}
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/hybris/egl/platforms/common/wayland-android-protocol.c b/hybris/egl/platforms/common/wayland-android-protocol.c
deleted file mode 100644
index f4903e2..0000000
--- a/hybris/egl/platforms/common/wayland-android-protocol.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* 
- * Copyright © 2012 Collabora, Ltd.
- * 
- * Permission to use, copy, modify, distribute, and sell this
- * software and its documentation for any purpose is hereby granted
- * without fee, provided that the above copyright notice appear in
- * all copies and that both that copyright notice and this permission
- * notice appear in supporting documentation, and that the name of
- * the copyright holders not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- * THIS SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <stdint.h>
-#include "wayland-util.h"
-
-extern const struct wl_interface android_wlegl_handle_interface;
-extern const struct wl_interface wl_buffer_interface;
-extern const struct wl_interface android_wlegl_handle_interface;
-
-static const struct wl_interface *types[] = {
-	NULL,
-	&android_wlegl_handle_interface,
-	NULL,
-	NULL,
-	&wl_buffer_interface,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	&android_wlegl_handle_interface,
-};
-
-static const struct wl_message android_wlegl_requests[] = {
-	{ "create_handle", "nia", types + 1 },
-	{ "create_buffer", "niiiiio", types + 4 },
-};
-
-WL_EXPORT const struct wl_interface android_wlegl_interface = {
-	"android_wlegl", 1,
-	2, android_wlegl_requests,
-	0, NULL,
-};
-
-static const struct wl_message android_wlegl_handle_requests[] = {
-	{ "add_fd", "h", types + 0 },
-	{ "destroy", "", types + 0 },
-};
-
-WL_EXPORT const struct wl_interface android_wlegl_handle_interface = {
-	"android_wlegl_handle", 1,
-	2, android_wlegl_handle_requests,
-	0, NULL,
-};
-
diff --git a/hybris/egl/platforms/common/wayland-android-server-protocol.h b/hybris/egl/platforms/common/wayland-android-server-protocol.h
deleted file mode 100644
index 78f77c9..0000000
--- a/hybris/egl/platforms/common/wayland-android-server-protocol.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* 
- * Copyright © 2012 Collabora, Ltd.
- * 
- * Permission to use, copy, modify, distribute, and sell this
- * software and its documentation for any purpose is hereby granted
- * without fee, provided that the above copyright notice appear in
- * all copies and that both that copyright notice and this permission
- * notice appear in supporting documentation, and that the name of
- * the copyright holders not be used in advertising or publicity
- * pertaining to distribution of the software without specific,
- * written prior permission.  The copyright holders make no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- * THIS SOFTWARE.
- */
-
-#ifndef ANDROID_SERVER_PROTOCOL_H
-#define ANDROID_SERVER_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-util.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct android_wlegl;
-struct android_wlegl_handle;
-
-extern const struct wl_interface android_wlegl_interface;
-extern const struct wl_interface android_wlegl_handle_interface;
-
-#ifndef ANDROID_WLEGL_ERROR_ENUM
-#define ANDROID_WLEGL_ERROR_ENUM
-enum android_wlegl_error {
-	ANDROID_WLEGL_ERROR_BAD_HANDLE = 0,
-	ANDROID_WLEGL_ERROR_BAD_VALUE = 1,
-};
-#endif /* ANDROID_WLEGL_ERROR_ENUM */
-
-/**
- * android_wlegl - Android EGL graphics buffer support
- * @create_handle: Create an Android native_handle_t object
- * @create_buffer: Create a wl_buffer from the native handle
- *
- * Interface used in the Android wrapper libEGL to share graphics buffers
- * between the server and the client.
- */
-struct android_wlegl_interface {
-	/**
-	 * create_handle - Create an Android native_handle_t object
-	 * @id: (none)
-	 * @num_fds: (none)
-	 * @ints: an array of int32_t
-	 *
-	 * This creator method initialises the native_handle_t object
-	 * with everything except the file descriptors, which have to be
-	 * submitted separately.
-	 */
-	void (*create_handle)(struct wl_client *client,
-			      struct wl_resource *resource,
-			      uint32_t id,
-			      int32_t num_fds,
-			      struct wl_array *ints);
-	/**
-	 * create_buffer - Create a wl_buffer from the native handle
-	 * @id: (none)
-	 * @width: (none)
-	 * @height: (none)
-	 * @stride: (none)
-	 * @format: (none)
-	 * @usage: (none)
-	 * @native_handle: (none)
-	 *
-	 * Pass the Android native_handle_t to the server and attach it
-	 * to the new wl_buffer object.
-	 *
-	 * The android_wlegl_handle object must be destroyed immediately
-	 * after this request.
-	 */
-	void (*create_buffer)(struct wl_client *client,
-			      struct wl_resource *resource,
-			      uint32_t id,
-			      int32_t width,
-			      int32_t height,
-			      int32_t stride,
-			      int32_t format,
-			      int32_t usage,
-			      struct wl_resource *native_handle);
-};
-
-#ifndef ANDROID_WLEGL_HANDLE_ERROR_ENUM
-#define ANDROID_WLEGL_HANDLE_ERROR_ENUM
-enum android_wlegl_handle_error {
-	ANDROID_WLEGL_HANDLE_ERROR_TOO_MANY_FDS = 0,
-};
-#endif /* ANDROID_WLEGL_HANDLE_ERROR_ENUM */
-
-/**
- * android_wlegl_handle - An Android native_handle_t object
- * @add_fd: (none)
- * @destroy: (none)
- *
- * The Android native_handle_t is a semi-opaque object, that contains an
- * EGL implementation specific number of int32 values and file descriptors.
- *
- * We cannot send a variable size array of file descriptors over the
- * Wayland protocol, so we send them one by one.
- */
-struct android_wlegl_handle_interface {
-	/**
-	 * add_fd - (none)
-	 * @fd: (none)
-	 */
-	void (*add_fd)(struct wl_client *client,
-		       struct wl_resource *resource,
-		       int32_t fd);
-	/**
-	 * destroy - (none)
-	 */
-	void (*destroy)(struct wl_client *client,
-			struct wl_resource *resource);
-};
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/hybris/egl/platforms/common/wayland-android.xml b/hybris/egl/platforms/common/wayland-android.xml
index 647a8ca..24ef780 100644
--- a/hybris/egl/platforms/common/wayland-android.xml
+++ b/hybris/egl/platforms/common/wayland-android.xml
@@ -26,7 +26,7 @@
     THIS SOFTWARE.
   </copyright>
 
-  <interface name="android_wlegl" version="1">
+  <interface name="android_wlegl" version="2">
     <description summary="Android EGL graphics buffer support">
       Interface used in the Android wrapper libEGL to share
       graphics buffers between the server and the client.
@@ -67,6 +67,15 @@
       <arg name="native_handle" type="object" interface="android_wlegl_handle" />
     </request>
 
+
+    <request name="get_server_buffer_handle" since="2">
+        <arg name="id" type="new_id" interface="android_wlegl_server_buffer_handle"/>
+        <arg name="width" type="int"/>
+        <arg name="height" type="int"/>
+        <arg name="format" type="int"/>
+        <arg name="usage" type="int"/>
+    </request>
+
   </interface>
 
   <interface name="android_wlegl_handle" version="1">
@@ -91,4 +100,28 @@
 
   </interface>
 
+
+  <interface name="android_wlegl_server_buffer_handle" version="1">
+      <description summary="a server allocated buffer">
+          On creation a server_side_buffer object will immediately send
+          the "buffer_fd" and "buffer_ints" events needed by the client to
+          reference the gralloc buffer, followed by the "buffer" event carrying
+          the wl_buffer object.
+      </description>
+      <event name="buffer_fd">
+          <arg name="fd" type="fd"/>
+      </event>
+      <event name="buffer_ints">
+          <arg name="ints" type="array"/>
+      </event>
+      <event name="buffer">
+          <description summary="the wl_buffer">
+              This event will be sent after the ints and all the fds have been sent
+          </description>
+          <arg name="buffer" type="new_id" interface="wl_buffer"/>
+          <arg name="format" type="int"/>
+          <arg name="stride" type="int"/>
+      </event>
+  </interface>
+
 </protocol>
diff --git a/hybris/egl/platforms/common/wayland-egl-priv.h b/hybris/egl/platforms/common/wayland-egl-priv.h
index 9fc3c80..8c2d10d 100644
--- a/hybris/egl/platforms/common/wayland-egl-priv.h
+++ b/hybris/egl/platforms/common/wayland-egl-priv.h
@@ -27,6 +27,7 @@ struct wl_egl_window {
 
 	void *nativewindow;
 	void (*resize_callback)(struct wl_egl_window *, void *);
+	void (*free_callback)(struct wl_egl_window *, void *);
 };
 
 #ifdef  __cplusplus
diff --git a/hybris/egl/platforms/common/wayland-egl.c b/hybris/egl/platforms/common/wayland-egl.c
index 38a48fe..0fab487 100644
--- a/hybris/egl/platforms/common/wayland-egl.c
+++ b/hybris/egl/platforms/common/wayland-egl.c
@@ -1,3 +1,4 @@
+#include <android-config.h>
 #include <stdlib.h>
 
 #include <wayland-client.h>
@@ -30,6 +31,7 @@ wl_egl_window_create(struct wl_surface *surface,
 
 	egl_window->surface = surface;
 	egl_window->resize_callback = NULL;
+	egl_window->free_callback = NULL;
 	wl_egl_window_resize(egl_window, width, height, 0, 0);
 	egl_window->attached_width  = 0;
 	egl_window->attached_height = 0;
@@ -42,6 +44,8 @@ wl_egl_window_create(struct wl_surface *surface,
 WL_EGL_EXPORT void
 wl_egl_window_destroy(struct wl_egl_window *egl_window)
 {
+	if (egl_window->free_callback)
+		egl_window->free_callback(egl_window, NULL);
 	free(egl_window);
 }
 
diff --git a/hybris/egl/platforms/common/windowbuffer.cpp b/hybris/egl/platforms/common/windowbuffer.cpp
index b75bc17..c7ed412 100644
--- a/hybris/egl/platforms/common/windowbuffer.cpp
+++ b/hybris/egl/platforms/common/windowbuffer.cpp
@@ -20,13 +20,18 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <android-config.h>
 #include <cstring>
 #include <cassert>
 #include "windowbuffer.h"
 
 RemoteWindowBuffer::~RemoteWindowBuffer()
 {
+    if (!m_allocated) {
 	this->m_gralloc->unregisterBuffer(this->m_gralloc, this->handle);
 	native_handle_close(this->handle);
 	native_handle_delete(const_cast<native_handle_t*>(this->handle)); 
+    } else if (this->m_alloc) {
+      this->m_alloc->free((alloc_device_t *)this->m_alloc, this->handle);
+    }
 }
diff --git a/hybris/egl/platforms/common/windowbuffer.h b/hybris/egl/platforms/common/windowbuffer.h
index 5f5628c..7a59821 100644
--- a/hybris/egl/platforms/common/windowbuffer.h
+++ b/hybris/egl/platforms/common/windowbuffer.h
@@ -38,7 +38,8 @@ class RemoteWindowBuffer : public BaseNativeWindowBuffer
 				unsigned int format,
 				unsigned int usage,
 				buffer_handle_t handle,
-				const gralloc_module_t *gralloc	
+				const gralloc_module_t *gralloc,
+				const alloc_device_t *alloc = NULL
 				) {
 			// Base members
 			ANativeWindowBuffer::width = width;
@@ -48,9 +49,17 @@ class RemoteWindowBuffer : public BaseNativeWindowBuffer
 			ANativeWindowBuffer::stride = stride;
 			ANativeWindowBuffer::handle = handle;
 			this->m_gralloc = gralloc;
+			this->m_alloc = alloc;
+			this->m_allocated = false;
 		};
 		~RemoteWindowBuffer();
+
+		void setAllocated(bool allocated) { m_allocated = allocated; }
+		bool isAllocated() const { return m_allocated; }
+
 	private:
 		const gralloc_module_t *m_gralloc;
+		const alloc_device_t *m_alloc;
+                bool m_allocated;
 };
 #endif /* WINDOWBUFFER_H */
diff --git a/hybris/egl/platforms/fbdev/Makefile.am b/hybris/egl/platforms/fbdev/Makefile.am
index 327ba1b..2312cc9 100644
--- a/hybris/egl/platforms/fbdev/Makefile.am
+++ b/hybris/egl/platforms/fbdev/Makefile.am
@@ -9,7 +9,7 @@ eglplatform_fbdev_la_CXXFLAGS = \
 	-I$(top_srcdir)/common \
 	-I$(top_srcdir)/egl \
 	-I$(top_srcdir)/egl/platforms/common \
-	-I$(top_srcdir)/include/android
+	$(ANDROID_HEADERS_CFLAGS)
 
 if WANT_TRACE
 eglplatform_fbdev_la_CXXFLAGS += -DDEBUG
diff --git a/hybris/egl/platforms/fbdev/eglplatform_fbdev.cpp b/hybris/egl/platforms/fbdev/eglplatform_fbdev.cpp
index 8557f7e..d8228a9 100644
--- a/hybris/egl/platforms/fbdev/eglplatform_fbdev.cpp
+++ b/hybris/egl/platforms/fbdev/eglplatform_fbdev.cpp
@@ -1,3 +1,4 @@
+#include <android-config.h>
 #include <ws.h>
 #include "fbdev_window.h"
 #include <malloc.h>
@@ -13,48 +14,58 @@ extern "C" {
 
 #include "logging.h"
 
-static int inited = 0;
 static gralloc_module_t *gralloc = 0;
 static framebuffer_device_t *framebuffer = 0;
 static alloc_device_t *alloc = 0;
 static FbDevNativeWindow *_nativewindow = NULL;
 
-extern "C" int fbdevws_IsValidDisplay(EGLNativeDisplayType display)
+extern "C" void fbdevws_init_module(struct ws_egl_interface *egl_iface)
 {
-	if (__sync_fetch_and_add(&inited,1)==0)
-	{
-		int err;
-		err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t **) &gralloc);
-		if (gralloc==NULL) {
-			fprintf(stderr, "failed to get gralloc module: (%s)\n",strerror(-err));
-			assert(0);
-		}
-
-		err = framebuffer_open((hw_module_t *) gralloc, &framebuffer);
-		if (err) {
-			fprintf(stderr, "ERROR: failed to open framebuffer: (%s)\n",strerror(-err));
-			assert(0);
-		}
-		TRACE("** framebuffer_open: status=(%s) format=x%x", strerror(-err), framebuffer->format);
-
-		err = gralloc_open((const hw_module_t *) gralloc, &alloc);
-		if (err) {
-			fprintf(stderr, "ERROR: failed to open gralloc: (%s)\n",strerror(-err));
-			assert(0);
-		}
-		TRACE("** gralloc_open %p status=%s", gralloc, strerror(-err));
-		eglplatformcommon_init(gralloc, alloc);
+	int err;
+	err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t **) &gralloc);
+	if (gralloc==NULL) {
+		fprintf(stderr, "failed to get gralloc module: (%s)\n",strerror(-err));
+		assert(0);
 	}
 
-	return display == EGL_DEFAULT_DISPLAY;
+	err = framebuffer_open((hw_module_t *) gralloc, &framebuffer);
+	if (err) {
+		fprintf(stderr, "ERROR: failed to open framebuffer: (%s)\n",strerror(-err));
+		assert(0);
+	}
+	TRACE("** framebuffer_open: status=(%s) format=x%x", strerror(-err), framebuffer->format);
+
+	err = gralloc_open((const hw_module_t *) gralloc, &alloc);
+	if (err) {
+		fprintf(stderr, "ERROR: failed to open gralloc: (%s)\n",strerror(-err));
+		assert(0);
+	}
+	TRACE("** gralloc_open %p status=%s", gralloc, strerror(-err));
+	eglplatformcommon_init(egl_iface, gralloc, alloc);
+}
+
+extern "C" _EGLDisplay *fbdevws_GetDisplay(EGLNativeDisplayType display)
+{
+	assert (gralloc != NULL);
+
+	_EGLDisplay *dpy = 0;
+	if (display == EGL_DEFAULT_DISPLAY) {
+		dpy = new _EGLDisplay;
+	}
+	return dpy;
+}
+
+extern "C" void fbdevws_Terminate(_EGLDisplay *dpy)
+{
+	delete dpy;
 }
 
-extern "C" EGLNativeWindowType fbdevws_CreateWindow(EGLNativeWindowType win, EGLNativeDisplayType display)
+extern "C" EGLNativeWindowType fbdevws_CreateWindow(EGLNativeWindowType win, _EGLDisplay *display)
 {
-	assert (inited >= 1);
+	assert (gralloc != NULL);
 	assert (_nativewindow == NULL);
 
-	_nativewindow = new FbDevNativeWindow(gralloc, alloc, framebuffer);
+	_nativewindow = new FbDevNativeWindow(alloc, framebuffer);
 	_nativewindow->common.incRef(&_nativewindow->common);
 	return (EGLNativeWindowType) static_cast<struct ANativeWindow *>(_nativewindow);
 }
@@ -79,13 +90,24 @@ extern "C" void fbdevws_passthroughImageKHR(EGLContext *ctx, EGLenum *target, EG
 	eglplatformcommon_passthroughImageKHR(ctx, target, buffer, attrib_list);
 }
 
+extern "C" void fbdevws_setSwapInterval(EGLDisplay dpy, EGLNativeWindowType win, EGLint interval)
+{
+	FbDevNativeWindow *window = static_cast<FbDevNativeWindow *>((struct ANativeWindow *)win);
+	window->setSwapInterval(interval);
+}
+
 struct ws_module ws_module_info = {
-	fbdevws_IsValidDisplay,
+	fbdevws_init_module,
+	fbdevws_GetDisplay,
+	fbdevws_Terminate,
 	fbdevws_CreateWindow,
 	fbdevws_DestroyWindow,
 	fbdevws_eglGetProcAddress,
 	fbdevws_passthroughImageKHR,
-	eglplatformcommon_eglQueryString
+	eglplatformcommon_eglQueryString,
+	NULL,
+	NULL,
+	fbdevws_setSwapInterval,
 };
 
 // vim:ts=4:sw=4:noexpandtab
diff --git a/hybris/egl/platforms/fbdev/fbdev_window.cpp b/hybris/egl/platforms/fbdev/fbdev_window.cpp
index 40ffcf3..f5f7680 100644
--- a/hybris/egl/platforms/fbdev/fbdev_window.cpp
+++ b/hybris/egl/platforms/fbdev/fbdev_window.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <android-config.h>
 #include "fbdev_window.h"
 #include "logging.h"
 
@@ -22,8 +23,6 @@
 #include <pthread.h>
 #include <stdio.h>
 
-#include <android/android-version.h>
-
 #define FRAMEBUFFER_PARTITIONS 2
 
 static pthread_cond_t _cond = PTHREAD_COND_INITIALIZER;
@@ -65,16 +64,17 @@ FbDevNativeWindowBuffer::~FbDevNativeWindowBuffer()
 
 
 ////////////////////////////////////////////////////////////////////////////////
-FbDevNativeWindow::FbDevNativeWindow(gralloc_module_t* gralloc,
-                            alloc_device_t* alloc,
+FbDevNativeWindow::FbDevNativeWindow( alloc_device_t* alloc,
                             framebuffer_device_t* fbDev)
 {
     m_alloc = alloc;
     m_fbDev = fbDev;
     m_bufFormat = m_fbDev->format;
     m_usage = GRALLOC_USAGE_HW_FB;
+    m_bufferCount = 0;
+    m_allocateBuffers = true;
 
-#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2
+#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2 || ANDROID_VERSION_MAJOR>=5
     if (m_fbDev->numFramebuffers>0)
         setBufferCount(m_fbDev->numFramebuffers);
     else
@@ -151,6 +151,9 @@ int FbDevNativeWindow::dequeueBuffer(BaseNativeWindowBuffer** buffer, int *fence
 
     pthread_mutex_lock(&_mutex);
 
+    if (m_allocateBuffers)
+        reallocateBuffers();
+
     HYBRIS_TRACE_BEGIN("fbdev-platform", "dequeueBuffer-wait", "");
 #if defined(DEBUG)
 
@@ -453,12 +456,9 @@ unsigned int FbDevNativeWindow::transformHint() const
  */
 int FbDevNativeWindow::setUsage(int usage)
 {
-    int need_realloc = (m_usage != usage);
-    TRACE("usage=x%x realloc=%d", usage, need_realloc);
+    m_allocateBuffers = (m_usage != usage);
+    TRACE("usage=x%x m_allocateBuffers=%d", usage, m_allocateBuffers);
     m_usage = usage;
-    if (need_realloc)
-        this->setBufferCount(m_bufList.size());
-
     return NO_ERROR;
 }
 
@@ -471,11 +471,9 @@ int FbDevNativeWindow::setUsage(int usage)
  */
 int FbDevNativeWindow::setBuffersFormat(int format)
 {
-    int need_realloc = (format != m_bufFormat);
-    TRACE("format=x%x realloc=%d", format, need_realloc);
+    m_allocateBuffers |= (format != m_bufFormat);
+    TRACE("format=x%x m_allocateBuffers=%d", format, m_allocateBuffers);
     m_bufFormat = format;
-    if (need_realloc)
-        this->setBufferCount(m_bufList.size());
     return NO_ERROR;
 }
 
@@ -487,12 +485,18 @@ int FbDevNativeWindow::setBuffersFormat(int format)
 int FbDevNativeWindow::setBufferCount(int cnt)
 {
     TRACE("cnt=%d", cnt);
-    int err=NO_ERROR;
-    pthread_mutex_lock(&_mutex);
+    if (m_bufferCount != cnt) {
+        m_bufferCount = cnt;
+        m_allocateBuffers = true;
+    }
+    return NO_ERROR;
+}
 
+void FbDevNativeWindow::reallocateBuffers()
+{
     destroyBuffers();
 
-    for(unsigned int i = 0; i < cnt; i++)
+    for(unsigned int i = 0; i < m_bufferCount; i++)
     {
         FbDevNativeWindowBuffer *fbnb = new FbDevNativeWindowBuffer(m_alloc,
                             m_fbDev->width, m_fbDev->height, m_fbDev->format,
@@ -507,16 +511,15 @@ int FbDevNativeWindow::setBufferCount(int cnt)
         if (fbnb->status)
         {
             fbnb->common.decRef(&fbnb->common);
-            fprintf(stderr,"WARNING: %s: allocated only %d buffers out of %d\n", __PRETTY_FUNCTION__, m_freeBufs, cnt);
+            fprintf(stderr,"WARNING: %s: allocated only %d buffers out of %d\n", __PRETTY_FUNCTION__, m_freeBufs, m_bufferCount);
             break;
         }
 
         m_freeBufs++;
         m_bufList.push_back(fbnb);
     }
-    pthread_mutex_unlock(&_mutex);
 
-    return err;
+    m_allocateBuffers = false;
 }
 
 /*
diff --git a/hybris/egl/platforms/fbdev/fbdev_window.h b/hybris/egl/platforms/fbdev/fbdev_window.h
index 435ad8b..fa651bd 100644
--- a/hybris/egl/platforms/fbdev/fbdev_window.h
+++ b/hybris/egl/platforms/fbdev/fbdev_window.h
@@ -19,7 +19,7 @@
 
 #include "nativewindowbase.h"
 #include <linux/fb.h>
-#include <android/hardware/gralloc.h>
+#include <hardware/gralloc.h>
 
 #include <list>
 
@@ -44,13 +44,13 @@ protected:
 
 class FbDevNativeWindow : public BaseNativeWindow {
 public:
-    FbDevNativeWindow(gralloc_module_t* gralloc, alloc_device_t* alloc,
+    FbDevNativeWindow(alloc_device_t* alloc,
          framebuffer_device_t* fbDev);
     ~FbDevNativeWindow();
 
-protected:
     // overloads from BaseNativeWindow
     virtual int setSwapInterval(int interval);
+protected:
 
     virtual int dequeueBuffer(BaseNativeWindowBuffer** buffer, int* fenceFd);
     virtual int queueBuffer(BaseNativeWindowBuffer* buffer, int fenceFd);
@@ -73,13 +73,17 @@ protected:
 
 private:
     void destroyBuffers();
+    void reallocateBuffers();
 
 private:
     framebuffer_device_t* m_fbDev;
     alloc_device_t* m_alloc;
     unsigned int m_usage;
     unsigned int m_bufFormat;
+    unsigned int m_bufferCount;
     int m_freeBufs;
+    bool m_allocateBuffers;
+
     std::list<FbDevNativeWindowBuffer*> m_bufList;
     FbDevNativeWindowBuffer* m_frontBuf;
 };
diff --git a/hybris/egl/platforms/hwcomposer/Makefile.am b/hybris/egl/platforms/hwcomposer/Makefile.am
index ec429ee..7df979c 100644
--- a/hybris/egl/platforms/hwcomposer/Makefile.am
+++ b/hybris/egl/platforms/hwcomposer/Makefile.am
@@ -15,7 +15,7 @@ libhybris_hwcomposerwindow_la_CXXFLAGS = \
 	-I$(top_srcdir)/common \
 	-I$(top_srcdir)/egl \
 	-I$(top_srcdir)/egl/platforms/common \
-	-I$(top_srcdir)/include/android
+	$(ANDROID_HEADERS_CFLAGS)
 
 if WANT_TRACE
 libhybris_hwcomposerwindow_la_CXXFLAGS += -DDEBUG
@@ -32,7 +32,9 @@ libhybris_hwcomposerwindow_la_LDFLAGS = \
 if HAS_ANDROID_4_2_0
 libhybris_hwcomposerwindow_la_LDFLAGS += $(top_builddir)/libsync/libsync.la
 endif
-
+if HAS_ANDROID_5_0_0
+libhybris_hwcomposerwindow_la_LDFLAGS += $(top_builddir)/libsync/libsync.la
+endif
 pkglib_LTLIBRARIES = eglplatform_hwcomposer.la
 
 eglplatform_hwcomposer_la_SOURCES = \
@@ -43,7 +45,7 @@ eglplatform_hwcomposer_la_CXXFLAGS = \
 	-I$(top_srcdir)/common \
 	-I$(top_srcdir)/egl \
 	-I$(top_srcdir)/egl/platforms/common \
-	-I$(top_srcdir)/include/android
+	$(ANDROID_HEADERS_CFLAGS)
 
 if WANT_TRACE
 eglplatform_hwcomposer_la_CXXFLAGS += -DDEBUG
diff --git a/hybris/egl/platforms/hwcomposer/eglplatform_hwcomposer.cpp b/hybris/egl/platforms/hwcomposer/eglplatform_hwcomposer.cpp
index 4385b6b..da24ae6 100644
--- a/hybris/egl/platforms/hwcomposer/eglplatform_hwcomposer.cpp
+++ b/hybris/egl/platforms/hwcomposer/eglplatform_hwcomposer.cpp
@@ -1,3 +1,4 @@
+#include <android-config.h>
 #include <ws.h>
 #include "hwcomposer_window.h"
 #include <malloc.h>
@@ -13,37 +14,46 @@ extern "C" {
 
 #include "logging.h"
 
-static int inited = 0;
 static gralloc_module_t *gralloc = 0;
 static alloc_device_t *alloc = 0;
 static HWComposerNativeWindow *_nativewindow = NULL;
 
-extern "C" int hwcomposerws_IsValidDisplay(EGLNativeDisplayType display)
+extern "C" void hwcomposerws_init_module(struct ws_egl_interface *egl_iface)
 {
-	if (__sync_fetch_and_add(&inited,1)==0)
-	{
-		int err;
-		err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t **) &gralloc);
-		if (gralloc==NULL) {
-			fprintf(stderr, "failed to get gralloc module: (%s)\n",strerror(-err));
-			assert(0);
-		}
+	int err;
+	err = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t **) &gralloc);
+	if (gralloc==NULL) {
+		fprintf(stderr, "failed to get gralloc module: (%s)\n",strerror(-err));
+		assert(0);
+	}
 
-		err = gralloc_open((const hw_module_t *) gralloc, &alloc);
-		if (err) {
-			fprintf(stderr, "ERROR: failed to open gralloc: (%s)\n",strerror(-err));
-			assert(0);
-		}
-		TRACE("** gralloc_open %p status=%s", gralloc, strerror(-err));
-		eglplatformcommon_init(gralloc, alloc);
+	err = gralloc_open((const hw_module_t *) gralloc, &alloc);
+	if (err) {
+		fprintf(stderr, "ERROR: failed to open gralloc: (%s)\n",strerror(-err));
+		assert(0);
 	}
+	TRACE("** gralloc_open %p status=%s", gralloc, strerror(-err));
+	eglplatformcommon_init(egl_iface, gralloc, alloc);
+}
 
-	return display == EGL_DEFAULT_DISPLAY;
+extern "C" _EGLDisplay *hwcomposerws_GetDisplay(EGLNativeDisplayType display)
+{
+	assert (gralloc != NULL);
+	_EGLDisplay *dpy = 0;
+	if (display == EGL_DEFAULT_DISPLAY) {
+		dpy = new _EGLDisplay;
+	}
+	return dpy;
+}
+
+extern "C" void hwcomposerws_Terminate(_EGLDisplay *dpy)
+{
+	delete dpy;
 }
 
-extern "C" EGLNativeWindowType hwcomposerws_CreateWindow(EGLNativeWindowType win, EGLNativeDisplayType display)
+extern "C" EGLNativeWindowType hwcomposerws_CreateWindow(EGLNativeWindowType win, _EGLDisplay *display)
 {
-	assert (inited >= 1);
+	assert (gralloc != NULL);
 	assert (_nativewindow == NULL);
 
 	HWComposerNativeWindow *window = static_cast<HWComposerNativeWindow *>((ANativeWindow *) win);
@@ -74,7 +84,9 @@ extern "C" void hwcomposerws_passthroughImageKHR(EGLContext *ctx, EGLenum *targe
 }
 
 struct ws_module ws_module_info = {
-	hwcomposerws_IsValidDisplay,
+	hwcomposerws_init_module,
+	hwcomposerws_GetDisplay,
+	hwcomposerws_Terminate,
 	hwcomposerws_CreateWindow,
 	hwcomposerws_DestroyWindow,
 	hwcomposerws_eglGetProcAddress,
diff --git a/hybris/egl/platforms/hwcomposer/hwcomposer_window.cpp b/hybris/egl/platforms/hwcomposer/hwcomposer_window.cpp
index 0ea4068..18056dc 100644
--- a/hybris/egl/platforms/hwcomposer/hwcomposer_window.cpp
+++ b/hybris/egl/platforms/hwcomposer/hwcomposer_window.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <android-config.h>
 #include "hwcomposer_window.h"
 #include "logging.h"
 
@@ -23,10 +24,8 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include <android/android-version.h>
-
 extern "C" {
-#include <android/sync/sync.h>
+#include <sync/sync.h>
 };
  
 static pthread_cond_t _cond = PTHREAD_COND_INITIALIZER;
@@ -76,7 +75,7 @@ HWComposerNativeWindow::HWComposerNativeWindow(unsigned int width, unsigned int 
     m_width = width;
     m_height = height;
     m_bufFormat = format;
-    m_usage = GRALLOC_USAGE_HW_COMPOSER;
+    m_usage = GRALLOC_USAGE_HW_COMPOSER|GRALLOC_USAGE_HW_FB;
     m_frontBuf = NULL;
 }
 
@@ -163,44 +162,33 @@ int HWComposerNativeWindow::dequeueBuffer(BaseNativeWindowBuffer** buffer, int *
     }
 #endif
 
-
-    while (m_freeBufs==0)
-    {
-        pthread_cond_wait(&_cond, &_mutex);
-    }
-
-    while (1)
+    std::list<HWComposerNativeWindowBuffer*>::iterator it = m_bufList.begin();
+    for (; it != m_bufList.end(); ++it)
     {
-        std::list<HWComposerNativeWindowBuffer*>::iterator it = m_bufList.begin();
-        for (; it != m_bufList.end(); ++it)
-        {
-            if (*it==m_frontBuf)
-                continue;
-            if ((*it)->busy==0)
-            {
-                TRACE("Found a free non-front buffer");
-                break;
-            }
-        }
-        if (it == m_bufList.end())
-        {
-            // have to wait once again 
-            pthread_cond_wait(&_cond, &_mutex);
+        if (*it==m_frontBuf)
             continue;
+        if ((*it)->busy==0)
+        {
+            TRACE("Found a free non-front buffer");
+            break;
         }
-
+    }
+    if (it == m_bufList.end())
+    {  
+        fbnb = m_frontBuf;
+    }
+    else
+    {
         fbnb = *it;
-        break;
     }
     HYBRIS_TRACE_END("hwcomposer-platform", "dequeueBuffer-wait", "");
 
     assert(fbnb!=NULL);
     fbnb->busy = 1;
-    m_freeBufs--;
 
     *buffer = fbnb;
-    *fenceFd = -1;
-
+    *fenceFd = dup(fbnb->fenceFd);
+    close(fbnb->fenceFd);
     TRACE("%lu DONE --> %p", pthread_self(), fbnb);
     pthread_mutex_unlock(&_mutex);
     HYBRIS_TRACE_END("hwcomposer-platform", "dequeueBuffer", "");
@@ -233,67 +221,29 @@ int HWComposerNativeWindow::queueBuffer(BaseNativeWindowBuffer* buffer, int fenc
     HWComposerNativeWindowBuffer* fbnb = (HWComposerNativeWindowBuffer*) buffer;
 
     HYBRIS_TRACE_BEGIN("hwcomposer-platform", "queueBuffer", "-%p", fbnb);
-    fbnb->fenceFd = fenceFd;
-
+    
     pthread_mutex_lock(&_mutex);
-
-    /* Front buffer hasn't yet been picked up for posting */
-    while (m_frontBuf && m_frontBuf->busy >= 2)
-    {
-           pthread_cond_wait(&_cond, &_mutex);
-    }
-
-    assert(fbnb->busy==1);
-    fbnb->busy = 2;
     m_frontBuf = fbnb;
-    m_freeBufs++;
-
-    sync_wait(fenceFd, -1);
-    ::close(fenceFd);    
-
-    pthread_cond_signal(&_cond);
-
-    TRACE("%lu %p %p",pthread_self(), m_frontBuf, fbnb);
+    fbnb->fenceFd = fenceFd;
+    this->present(fbnb);
+    fbnb->busy = 0;
     pthread_mutex_unlock(&_mutex);
+    
+    // After this, we expect fenceFd to be equal to the release fd
+    TRACE("%lu %p %p",pthread_self(), m_frontBuf, fbnb);
     HYBRIS_TRACE_END("hwcomposer-platform", "queueBuffer", "-%p", fbnb);
 
     return 0;
 }
 
-void HWComposerNativeWindow::lockFrontBuffer(HWComposerNativeWindowBuffer **buffer)
+int HWComposerNativeWindow::getFenceBufferFd(HWComposerNativeWindowBuffer *buffer)
 {
-    TRACE("");
-    HWComposerNativeWindowBuffer *buf;
-    pthread_mutex_lock(&_mutex);
-    
-    while (!m_frontBuf)
-    {
-           pthread_cond_wait(&_cond, &_mutex);
-    }
-    
-    assert(m_frontBuf->busy == 2);
-    
-    m_frontBuf->busy = 3;
-    buf = m_frontBuf;
-    pthread_mutex_unlock(&_mutex);
-
-   *buffer = buf;
-    return;
-
+    return buffer->fenceFd;
 }
 
-void HWComposerNativeWindow::unlockFrontBuffer(HWComposerNativeWindowBuffer *buffer)
+void HWComposerNativeWindow::setFenceBufferFd(HWComposerNativeWindowBuffer *buffer, int fd)
 {
-    TRACE("");
-    pthread_mutex_lock(&_mutex);
-    
-    assert(buffer == m_frontBuf);
-    m_frontBuf->busy = 0; 
-
-    pthread_cond_signal(&_cond);
-    pthread_mutex_unlock(&_mutex);
-    
-    return;
+    buffer->fenceFd = fd;
 }
 
 /*
@@ -330,11 +280,7 @@ int HWComposerNativeWindow::cancelBuffer(BaseNativeWindowBuffer* buffer, int fen
 
     fbnb->busy=0;
 
-    m_freeBufs++;
-
-    pthread_cond_signal(&_cond);
-    pthread_mutex_unlock(&_mutex);
-
+    pthread_mutex_unlock(&_mutex); 
     return 0;
 }
 
@@ -494,7 +440,7 @@ int HWComposerNativeWindow::setBufferCount(int cnt)
     {
         HWComposerNativeWindowBuffer *fbnb = new HWComposerNativeWindowBuffer(m_alloc,
                             m_width, m_height, m_bufFormat,
-                            m_usage|GRALLOC_USAGE_HW_COMPOSER);
+                            m_usage|GRALLOC_USAGE_HW_COMPOSER|GRALLOC_USAGE_HW_FB);
 
         fbnb->common.incRef(&fbnb->common);
 
diff --git a/hybris/egl/platforms/hwcomposer/hwcomposer_window.h b/hybris/egl/platforms/hwcomposer/hwcomposer_window.h
index 3eb5335..0fd237b 100644
--- a/hybris/egl/platforms/hwcomposer/hwcomposer_window.h
+++ b/hybris/egl/platforms/hwcomposer/hwcomposer_window.h
@@ -19,7 +19,7 @@
 
 #include "nativewindowbase.h"
 #include <linux/fb.h>
-#include <android/hardware/gralloc.h>
+#include <hardware/gralloc.h>
 
 #include <list>
 
@@ -50,9 +50,8 @@ public:
     void setup(gralloc_module_t* gralloc, alloc_device_t* alloc);
 
 
-    void lockFrontBuffer(HWComposerNativeWindowBuffer **buffer);
-    void unlockFrontBuffer(HWComposerNativeWindowBuffer *buffer);
-
+    int getFenceBufferFd(HWComposerNativeWindowBuffer *buffer);
+    void setFenceBufferFd(HWComposerNativeWindowBuffer *buffer, int fd);
 protected:
     // overloads from BaseNativeWindow
     virtual int setSwapInterval(int interval);
@@ -75,7 +74,7 @@ protected:
     virtual int setBuffersFormat(int format);
     virtual int setBuffersDimensions(int width, int height);
     virtual int setBufferCount(int cnt);
-
+    virtual void present(HWComposerNativeWindowBuffer *buffer) = 0;
 private:
     void destroyBuffers();
 
diff --git a/hybris/egl/platforms/null/Makefile.am b/hybris/egl/platforms/null/Makefile.am
index 94ae895..e648a63 100644
--- a/hybris/egl/platforms/null/Makefile.am
+++ b/hybris/egl/platforms/null/Makefile.am
@@ -2,8 +2,25 @@ pkglib_LTLIBRARIES = eglplatform_null.la
 
 
 eglplatform_null_la_SOURCES = eglplatform_null.c
-eglplatform_null_la_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/egl
+eglplatform_null_la_CFLAGS = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/common \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/egl \
+	-I$(top_srcdir)/egl/platforms/common \
+	$(ANDROID_HEADERS_CFLAGS) \
+	$(WAYLAND_SERVER_CFLAGS)
 
-eglplatform_null_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
+eglplatform_null_la_LDFLAGS = \
+	-avoid-version -module -shared -export-dynamic \
+	$(top_builddir)/egl/platforms/common/libhybris-eglplatformcommon.la \
+	$(top_builddir)/hardware/libhardware.la \
+	$(WAYLAND_SERVER_LIBS)
 
+if WANT_DEBUG
+eglplatform_null_la_CFLAGS += -I$(top_srcdir)/common -ggdb -O0
+endif
 
+if WANT_TRACE
+eglplatform_null_la_CFLAGS += -DDEBUG
+endif
diff --git a/hybris/egl/platforms/null/eglplatform_null.c b/hybris/egl/platforms/null/eglplatform_null.c
index 5663a51..379afe7 100644
--- a/hybris/egl/platforms/null/eglplatform_null.c
+++ b/hybris/egl/platforms/null/eglplatform_null.c
@@ -1,13 +1,19 @@
+#include <android-config.h>
 #include <ws.h>
 #include <dlfcn.h>
 #include <stdlib.h>
 
-#include <hybris/internal/binding.h>
+#include <hybris/common/binding.h>
+#include <eglplatformcommon.h>
+#include "logging.h"
 
 static void * (*_androidCreateDisplaySurface)();
 
 static void *_libui = NULL;
 
+static gralloc_module_t *gralloc = 0;
+static alloc_device_t *alloc = 0;
+
 static void _init_androidui()
 {
        _libui = (void *) android_dlopen("/system/lib/libui.so", RTLD_LAZY);
@@ -22,13 +28,27 @@ static EGLNativeWindowType android_createDisplaySurface()
 }
 
 
+static void nullws_init_module(struct ws_egl_interface *egl_iface)
+{
+	int err;
+	hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t **) &gralloc);
+	err = gralloc_open((const hw_module_t *) gralloc, &alloc);
+	TRACE("++ %lu wayland: got gralloc %p err:%s", pthread_self(), gralloc, strerror(-err));
+	eglplatformcommon_init(egl_iface, gralloc, alloc);
 
-static int nullws_IsValidDisplay(EGLNativeDisplayType display)
+}
+
+static struct _EGLDisplay *nullws_GetDisplay(EGLNativeDisplayType display)
 {
-	return 1;
+	return malloc(sizeof(struct _EGLDisplay));
 }
 
-static EGLNativeWindowType nullws_CreateWindow(EGLNativeWindowType win, EGLNativeDisplayType display)
+static void nullws_Terminate(struct _EGLDisplay *dpy)
+{
+	free(dpy);
+}
+
+static EGLNativeWindowType nullws_CreateWindow(EGLNativeWindowType win, struct _EGLDisplay *display)
 {
 	if (win == 0)
 	{
@@ -43,27 +63,14 @@ static void nullws_DestroyWindow(EGLNativeWindowType win)
 	// TODO: Cleanup?
 }
 
-static __eglMustCastToProperFunctionPointerType nullws_eglGetProcAddress(const char *procname) 
-{
-	return NULL;
-}
-
-static void nullws_passthroughImageKHR(EGLContext *ctx, EGLenum *target, EGLClientBuffer *buffer, const EGLint **attrib_list)
-{
-}
-
-const char *nullws_eglQueryString(EGLDisplay dpy, EGLint name, const char *(*real_eglQueryString)(EGLDisplay dpy, EGLint name))
-{
-	return (*real_eglQueryString)(dpy, name);
-}
-
-
 struct ws_module ws_module_info = {
-	nullws_IsValidDisplay,
+	nullws_init_module,
+	nullws_GetDisplay,
+	nullws_Terminate,
 	nullws_CreateWindow,
 	nullws_DestroyWindow,
-	nullws_eglGetProcAddress,
-	nullws_passthroughImageKHR,
-	nullws_eglQueryString
+	eglplatformcommon_eglGetProcAddress,
+	eglplatformcommon_passthroughImageKHR,
+	eglplatformcommon_eglQueryString
 };
 
diff --git a/hybris/egl/platforms/wayland/Makefile.am b/hybris/egl/platforms/wayland/Makefile.am
index 62cecfc..8a5e9c6 100644
--- a/hybris/egl/platforms/wayland/Makefile.am
+++ b/hybris/egl/platforms/wayland/Makefile.am
@@ -6,7 +6,7 @@ eglplatform_wayland_la_CXXFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/egl \
 	-I$(top_srcdir)/egl/platforms/common \
-	-I$(top_srcdir)/include/android \
+	$(ANDROID_HEADERS_CFLAGS) \
 	$(WAYLAND_CLIENT_CFLAGS)
 
 if WANT_DEBUG
@@ -21,6 +21,10 @@ if WANT_DEBUG
 eglplatform_wayland_la_CXXFLAGS += -ggdb -O0
 endif
 
+if !WANT_WL_SERVERSIDE_BUFFERS
+eglplatform_wayland_la_CXXFLAGS += -DHYBRIS_NO_SERVER_SIDE_BUFFERS
+endif
+
 
 
 eglplatform_wayland_la_LDFLAGS = \
@@ -28,7 +32,11 @@ eglplatform_wayland_la_LDFLAGS = \
 	$(top_builddir)/egl/platforms/common/libhybris-eglplatformcommon.la \
 	$(top_builddir)/hardware/libhardware.la \
 	$(WAYLAND_CLIENT_LIBS)
-
 if HAS_ANDROID_4_2_0
 eglplatform_wayland_la_LDFLAGS += $(top_builddir)/libsync/libsync.la
 endif
+
+if HAS_ANDROID_5_0_0
+eglplatform_wayland_la_LDFLAGS += $(top_builddir)/libsync/libsync.la
+endif
+
diff --git a/hybris/egl/platforms/wayland/eglplatform_wayland.cpp b/hybris/egl/platforms/wayland/eglplatform_wayland.cpp
index c7b08e3..a71487f 100644
--- a/hybris/egl/platforms/wayland/eglplatform_wayland.cpp
+++ b/hybris/egl/platforms/wayland/eglplatform_wayland.cpp
@@ -16,25 +16,31 @@
  ** License version 2.1 as published by the Free Software Foundation
  ** and appearing in the file license.lgpl included in the packaging
  ** of this file.
- ** 
+ **
  ** This library is distributed in the hope that it will be useful,
  ** but WITHOUT ANY WARRANTY; without even the implied warranty of
  ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  ** Lesser General Public License for more details.
- ** 
+ **
  ****************************************************************************************/
 
+#include <android-config.h>
 #include <ws.h>
 #include <malloc.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <assert.h>
+#include <stdlib.h>
 extern "C" {
 #include <eglplatformcommon.h>
 };
+#include <eglhybris.h>
+
+#include <EGL/eglext.h>
 
 extern "C" {
 #include <wayland-client.h>
@@ -44,28 +50,146 @@ extern "C" {
 #include "wayland_window.h"
 #include "logging.h"
 #include "wayland-egl-priv.h"
+#include "server_wlegl_buffer.h"
+#include "wayland-android-client-protocol.h"
 
-static int inited = 0;
 static gralloc_module_t *gralloc = 0;
 static alloc_device_t *alloc = 0;
 
-extern "C" int waylandws_IsValidDisplay(EGLNativeDisplayType display)
+
+static const char *  (*_eglQueryString)(EGLDisplay dpy, EGLint name) = NULL;
+static __eglMustCastToProperFunctionPointerType (*_eglGetProcAddress)(const char *procname) = NULL;
+static EGLSyncKHR (*_eglCreateSyncKHR)(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list) = NULL;
+static EGLBoolean (*_eglDestroySyncKHR)(EGLDisplay dpy, EGLSyncKHR sync) = NULL;
+static EGLint (*_eglClientWaitSyncKHR)(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout) = NULL;
+
+struct WaylandDisplay {
+	_EGLDisplay base;
+
+	wl_display *wl_dpy;
+	wl_event_queue *queue;
+	wl_registry *registry;
+	android_wlegl *wlegl;
+};
+
+extern "C" void waylandws_init_module(struct ws_egl_interface *egl_iface)
 {
 	int err;
-	if ( __sync_fetch_and_add(&inited,1)==0)
-	{
-		hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t **) &gralloc);
-		err = gralloc_open((const hw_module_t *) gralloc, &alloc);
-		TRACE("++ %lu wayland: got gralloc %p err:%s", pthread_self(), gralloc, strerror(-err));
-		eglplatformcommon_init(gralloc, alloc);
+	hw_get_module(GRALLOC_HARDWARE_MODULE_ID, (const hw_module_t **) &gralloc);
+	err = gralloc_open((const hw_module_t *) gralloc, &alloc);
+	TRACE("++ %lu wayland: got gralloc %p err:%s", pthread_self(), gralloc, strerror(-err));
+	eglplatformcommon_init(egl_iface, gralloc, alloc);
+}
+
+static void _init_egl_funcs(EGLDisplay display)
+{
+	if (_eglQueryString != NULL)
+		return;
+
+	_eglQueryString = (const char * (*)(void*, int))
+			hybris_android_egl_dlsym("eglQueryString");
+	assert(_eglQueryString);
+	_eglGetProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char *))
+			hybris_android_egl_dlsym("eglGetProcAddress");
+	assert(_eglGetProcAddress);
+
+	const char *extensions = (*_eglQueryString)(display, EGL_EXTENSIONS);
+
+	if (strstr(extensions, "EGL_KHR_fence_sync")) {
+		_eglCreateSyncKHR = (PFNEGLCREATESYNCKHRPROC)
+				(*_eglGetProcAddress)("eglCreateSyncKHR");
+		assert(_eglCreateSyncKHR);
+		_eglDestroySyncKHR = (PFNEGLDESTROYSYNCKHRPROC)
+				(*_eglGetProcAddress)("eglDestroySyncKHR");
+		assert(_eglDestroySyncKHR);
+		_eglClientWaitSyncKHR = (PFNEGLCLIENTWAITSYNCKHRPROC)
+				(*_eglGetProcAddress)("eglClientWaitSyncKHR");
+		assert(_eglClientWaitSyncKHR);
 	}
+}
 
-	return 1;
+static void registry_handle_global(void *data, wl_registry *registry, uint32_t name, const char *interface, uint32_t version)
+{
+	WaylandDisplay *dpy = (WaylandDisplay *)data;
+
+	if (strcmp(interface, "android_wlegl") == 0) {
+		dpy->wlegl = static_cast<struct android_wlegl *>(wl_registry_bind(registry, name, &android_wlegl_interface, std::min(2u, version)));
+	}
+}
+
+static const wl_registry_listener registry_listener = {
+    registry_handle_global
+};
+
+static void callback_done(void *data, wl_callback *cb, uint32_t d)
+{
+    WaylandDisplay *dpy = (WaylandDisplay *)data;
+
+    wl_callback_destroy(cb);
+    if (!dpy->wlegl) {
+        fprintf(stderr, "Fatal: the server doesn't advertise the android_wlegl global!");
+        abort();
+    }
 }
 
-extern "C" EGLNativeWindowType waylandws_CreateWindow(EGLNativeWindowType win, EGLNativeDisplayType display)
+static const wl_callback_listener callback_listener = {
+    callback_done
+};
+
+extern "C" _EGLDisplay *waylandws_GetDisplay(EGLNativeDisplayType display)
+{
+	WaylandDisplay *wdpy = new WaylandDisplay;
+	wdpy->wl_dpy = (wl_display *)display;
+	wdpy->wlegl = NULL;
+	wdpy->queue = wl_display_create_queue(wdpy->wl_dpy);
+	wdpy->registry = wl_display_get_registry(wdpy->wl_dpy);
+	wl_proxy_set_queue((wl_proxy *) wdpy->registry, wdpy->queue);
+	wl_registry_add_listener(wdpy->registry, &registry_listener, wdpy);
+
+	wl_callback *cb = wl_display_sync(wdpy->wl_dpy);
+	wl_proxy_set_queue((wl_proxy *) cb, wdpy->queue);
+	wl_callback_add_listener(cb, &callback_listener, wdpy);
+
+	return &wdpy->base;
+}
+
+extern "C" void waylandws_Terminate(_EGLDisplay *dpy)
 {
-	WaylandNativeWindow *window = new WaylandNativeWindow((struct wl_egl_window *) win, (struct wl_display *) display, gralloc, alloc);
+	WaylandDisplay *wdpy = (WaylandDisplay *)dpy;
+	int ret = 0;
+	// We still have the sync callback on flight, wait for it to arrive
+	while (ret == 0 && !wdpy->wlegl) {
+		ret = wl_display_dispatch_queue(wdpy->wl_dpy, wdpy->queue);
+	}
+	assert(ret >= 0);
+	android_wlegl_destroy(wdpy->wlegl);
+	wl_registry_destroy(wdpy->registry);
+	wl_event_queue_destroy(wdpy->queue);
+	delete wdpy;
+}
+
+extern "C" EGLNativeWindowType waylandws_CreateWindow(EGLNativeWindowType win, _EGLDisplay *display)
+{
+	struct wl_egl_window *wl_window = (struct wl_egl_window*) win;
+	struct wl_display *wl_display = (struct wl_display*) display;
+
+	if (wl_window == 0 || wl_display == 0) {
+		HYBRIS_ERROR("Running with EGL_PLATFORM=wayland without setup wayland environment is not possible");
+		HYBRIS_ERROR("If you want to run a standlone EGL client do it like this:");
+		HYBRIS_ERROR(" $ export EGL_PLATFORM=null");
+		HYBRIS_ERROR(" $ test_glevs2");
+		abort();
+	}
+
+	WaylandDisplay *wdpy = (WaylandDisplay *)display;
+
+	int ret = 0;
+	while (ret == 0 && !wdpy->wlegl) {
+		ret = wl_display_dispatch_queue(wdpy->wl_dpy, wdpy->queue);
+	}
+	assert(ret >= 0);
+
+	WaylandNativeWindow *window = new WaylandNativeWindow((struct wl_egl_window *) win, wdpy->wl_dpy, wdpy->wlegl, alloc, gralloc);
 	window->common.incRef(&window->common);
 	return (EGLNativeWindowType) static_cast<struct ANativeWindow *>(window);
 }
@@ -83,12 +207,37 @@ extern "C" int waylandws_post(EGLNativeWindowType win, void *buffer)
 	return ((WaylandNativeWindow *) eglwin->nativewindow)->postBuffer((ANativeWindowBuffer *) buffer);
 }
 
-extern "C" __eglMustCastToProperFunctionPointerType waylandws_eglGetProcAddress(const char *procname) 
+extern "C" wl_buffer *waylandws_createWlBuffer(EGLDisplay dpy, EGLImageKHR image)
+{
+	egl_image *img = reinterpret_cast<egl_image *>(image);
+	if (!img) {
+	    // The spec says we should send a EGL_BAD_PARAMETER error here, but we don't have the
+	    // means, as of now.
+	    return NULL;
+	}
+	if (img->target == EGL_WAYLAND_BUFFER_WL) {
+		WaylandDisplay *wdpy = (WaylandDisplay *)hybris_egl_display_get_mapping(dpy);
+		server_wlegl_buffer *buf = server_wlegl_buffer_from((wl_resource *)img->egl_buffer);
+		WaylandNativeWindowBuffer wnb(buf->buf);
+		// The buffer will be managed by the app, so pass NULL as the queue so that
+		// it will be assigned to the default queue
+		wnb.wlbuffer_from_native_handle(wdpy->wlegl, wdpy->wl_dpy, NULL);
+		return wnb.wlbuffer;
+	}
+	// EGL_BAD_MATCH
+	return NULL;
+}
+
+extern "C" __eglMustCastToProperFunctionPointerType waylandws_eglGetProcAddress(const char *procname)
 {
 	if (strcmp(procname, "eglHybrisWaylandPostBuffer") == 0)
 	{
 		return (__eglMustCastToProperFunctionPointerType) waylandws_post;
 	}
+	else if (strcmp(procname, "eglCreateWaylandBufferFromImageWL") == 0)
+    {
+        return (__eglMustCastToProperFunctionPointerType) waylandws_createWlBuffer;
+    }
 	else
 	return eglplatformcommon_eglGetProcAddress(procname);
 }
@@ -98,13 +247,56 @@ extern "C" void waylandws_passthroughImageKHR(EGLContext *ctx, EGLenum *target, 
 	eglplatformcommon_passthroughImageKHR(ctx, target, buffer, attrib_list);
 }
 
+extern "C" const char *waylandws_eglQueryString(EGLDisplay dpy, EGLint name, const char *(*real_eglQueryString)(EGLDisplay dpy, EGLint name))
+{
+	const char *ret = eglplatformcommon_eglQueryString(dpy, name, real_eglQueryString);
+	if (ret && name == EGL_EXTENSIONS)
+	{
+		static char eglextensionsbuf[512];
+		snprintf(eglextensionsbuf, 510, "%s %s", ret,
+			"EGL_EXT_swap_buffers_with_damage EGL_WL_create_wayland_buffer_from_image"
+		);
+		ret = eglextensionsbuf;
+	}
+	return ret;
+}
+
+extern "C" void waylandws_prepareSwap(EGLDisplay dpy, EGLNativeWindowType win, EGLint *damage_rects, EGLint damage_n_rects)
+{
+	WaylandNativeWindow *window = static_cast<WaylandNativeWindow *>((struct ANativeWindow *)win);
+	window->prepareSwap(damage_rects, damage_n_rects);
+}
+
+extern "C" void waylandws_finishSwap(EGLDisplay dpy, EGLNativeWindowType win)
+{
+	_init_egl_funcs(dpy);
+	WaylandNativeWindow *window = static_cast<WaylandNativeWindow *>((struct ANativeWindow *)win);
+	if (_eglCreateSyncKHR) {
+		EGLSyncKHR sync = (*_eglCreateSyncKHR)(dpy, EGL_SYNC_FENCE_KHR, NULL);
+		(*_eglClientWaitSyncKHR)(dpy, sync, EGL_SYNC_FLUSH_COMMANDS_BIT_KHR, EGL_FOREVER_KHR);
+		(*_eglDestroySyncKHR)(dpy, sync);
+	}
+	window->finishSwap();
+}
+
+extern "C" void waylandws_setSwapInterval(EGLDisplay dpy, EGLNativeWindowType win, EGLint interval)
+{
+	WaylandNativeWindow *window = static_cast<WaylandNativeWindow *>((struct ANativeWindow *)win);
+	window->setSwapInterval(interval);
+}
+
 struct ws_module ws_module_info = {
-	waylandws_IsValidDisplay,
+	waylandws_init_module,
+	waylandws_GetDisplay,
+	waylandws_Terminate,
 	waylandws_CreateWindow,
 	waylandws_DestroyWindow,
 	waylandws_eglGetProcAddress,
 	waylandws_passthroughImageKHR,
-	eglplatformcommon_eglQueryString
+	waylandws_eglQueryString,
+	waylandws_prepareSwap,
+	waylandws_finishSwap,
+	waylandws_setSwapInterval,
 };
 
 
diff --git a/hybris/egl/platforms/wayland/wayland_window.cpp b/hybris/egl/platforms/wayland/wayland_window.cpp
index 2b13bf9..271df57 100644
--- a/hybris/egl/platforms/wayland/wayland_window.cpp
+++ b/hybris/egl/platforms/wayland/wayland_window.cpp
@@ -25,6 +25,7 @@
  ****************************************************************************************/
 
 
+#include <android-config.h>
 #include "wayland_window.h"
 #include "wayland-egl-priv.h"
 #include <assert.h>
@@ -32,18 +33,29 @@
 #include <errno.h>
 
 #include "logging.h"
-#include <android/android-version.h>
 #include <eglhybris.h>
 
-#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2
+#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2 || ANDROID_VERSION_MAJOR>=5
 extern "C" {
-#include <android/sync/sync.h>
+#include <sync/sync.h>
 }
 #endif
 
+static void
+buffer_create_sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
+{
+   struct wl_callback **created_callback = static_cast<struct wl_callback **>(data);
+
+   *created_callback = NULL;
+   wl_callback_destroy(callback);
+}
 
+static const struct wl_callback_listener buffer_create_sync_listener = {
+   buffer_create_sync_callback
+};
 
-void WaylandNativeWindowBuffer::wlbuffer_from_native_handle(struct android_wlegl *android_wlegl)
+void WaylandNativeWindowBuffer::wlbuffer_from_native_handle(struct android_wlegl *android_wlegl,
+                                                            struct wl_display *display, struct wl_event_queue *queue)
 {
     struct wl_array ints;
     int *ints_data;
@@ -64,16 +76,32 @@ void WaylandNativeWindowBuffer::wlbuffer_from_native_handle(struct android_wlegl
     wlbuffer = android_wlegl_create_buffer(android_wlegl,
             width, height, stride,
             format, usage, wlegl_handle);
+    wl_proxy_set_queue((struct wl_proxy *) wlbuffer, queue);
 
     android_wlegl_handle_destroy(wlegl_handle);
+
+    creation_callback = wl_display_sync(display);
+    wl_callback_add_listener(creation_callback, &buffer_create_sync_listener, &creation_callback);
+    wl_proxy_set_queue((struct wl_proxy *)creation_callback, queue);
+}
+
+void WaylandNativeWindow::resize(unsigned int width, unsigned int height)
+{
+    lock();
+    this->m_defaultWidth = width;
+    this->m_defaultHeight = height;
+    unlock();
 }
 
 void WaylandNativeWindow::resize_callback(struct wl_egl_window *egl_window, void *)
 {
     TRACE("%dx%d",egl_window->width,egl_window->height);
-    native_window_set_buffers_dimensions(
-        (WaylandNativeWindow*)egl_window->nativewindow,
-        egl_window->width,egl_window->height);
+    ((WaylandNativeWindow *) egl_window->nativewindow)->resize(egl_window->width, egl_window->height);
+}
+
+void WaylandNativeWindow::free_callback(struct wl_egl_window *egl_window, void *)
+{
+    ((WaylandNativeWindow*)(egl_window->nativewindow))->m_window = 0;
 }
 
 void WaylandNativeWindow::lock()
@@ -86,23 +114,7 @@ void WaylandNativeWindow::unlock()
     pthread_mutex_unlock(&this->mutex);
 }
 
-    void
-WaylandNativeWindow::registry_handle_global(void *data, struct wl_registry *registry, uint32_t name,
-        const char *interface, uint32_t version)
-{
-    WaylandNativeWindow *nw = static_cast<WaylandNativeWindow *>(data);
-
-    if (strcmp(interface, "android_wlegl") == 0) {
-        nw->m_android_wlegl = static_cast<struct android_wlegl *>(wl_registry_bind(registry, name, &android_wlegl_interface, 1));
-    }
-}
-
-static const struct wl_registry_listener registry_listener = {
-    WaylandNativeWindow::registry_handle_global
-};
-
-
-    void
+void
 WaylandNativeWindow::sync_callback(void *data, struct wl_callback *callback, uint32_t serial)
 {
     int *done = static_cast<int *>(data);
@@ -115,7 +127,7 @@ static const struct wl_callback_listener sync_listener = {
     WaylandNativeWindow::sync_callback
 };
 
-    int
+int
 WaylandNativeWindow::wayland_roundtrip(WaylandNativeWindow *display)
 {
     struct wl_callback *callback;
@@ -125,7 +137,7 @@ WaylandNativeWindow::wayland_roundtrip(WaylandNativeWindow *display)
     callback = wl_display_sync(display->m_display);
     wl_callback_add_listener(callback, &sync_listener, &done);
     wl_proxy_set_queue((struct wl_proxy *) callback, display->wl_queue);
-    while (ret == 0 && !done)
+    while (ret >= 0 && !done)
         ret = wl_display_dispatch_queue(display->m_display, display->wl_queue);
 
     return ret;
@@ -147,7 +159,7 @@ static void check_fatal_error(struct wl_display *display)
     abort();
 }
 
-    static void
+static void
 wayland_frame_callback(void *data, struct wl_callback *callback, uint32_t time)
 {
     WaylandNativeWindow *surface = static_cast<WaylandNativeWindow *>(data);
@@ -159,7 +171,8 @@ static const struct wl_callback_listener frame_listener = {
     wayland_frame_callback
 };
 
-WaylandNativeWindow::WaylandNativeWindow(struct wl_egl_window *window, struct wl_display *display, const gralloc_module_t* gralloc, alloc_device_t* alloc_device)
+WaylandNativeWindow::WaylandNativeWindow(struct wl_egl_window *window, struct wl_display *display, android_wlegl *wlegl, alloc_device_t* alloc_device, gralloc_module_t *gralloc)
+    : m_android_wlegl(wlegl)
 {
     int wayland_ok;
 
@@ -172,25 +185,27 @@ WaylandNativeWindow::WaylandNativeWindow(struct wl_egl_window *window, struct wl
     this->m_defaultWidth = window->width;
     this->m_defaultHeight = window->height;
     this->m_window->resize_callback = resize_callback;
-    this->m_format = 1;
-    this->wl_queue = wl_display_create_queue(display);
+    this->m_window->free_callback = free_callback;
     this->frame_callback = NULL;
-    this->registry = wl_display_get_registry(display);
-    wl_proxy_set_queue((struct wl_proxy *) this->registry,
-            this->wl_queue);
-    wl_registry_add_listener(this->registry, &registry_listener, this);
+    this->wl_queue = wl_display_create_queue(display);
+    this->m_format = 1;
 
-    wayland_ok = wayland_roundtrip(this);
-    assert(wayland_ok >= 0);
-    assert(this->m_android_wlegl != NULL);
+	const_cast<int&>(ANativeWindow::minSwapInterval) = 0;
+	const_cast<int&>(ANativeWindow::maxSwapInterval) = 1;
+    // This is the default as per the EGL documentation
+    this->m_swap_interval = 1;
 
-    this->m_gralloc = gralloc;
     this->m_alloc = alloc_device;
+    m_gralloc = gralloc;
 
     m_usage=GRALLOC_USAGE_HW_RENDER | GRALLOC_USAGE_HW_TEXTURE;
     pthread_mutex_init(&mutex, NULL);
     pthread_cond_init(&cond, NULL);
+    m_queueReads = 0;
     m_freeBufs = 0;
+    m_damage_rects = NULL;
+    m_damage_n_rects = 0;
+    m_lastBuffer = 0;
     setBufferCount(3);
     HYBRIS_TRACE_END("wayland-platform", "create_window", "");
 }
@@ -198,19 +213,15 @@ WaylandNativeWindow::WaylandNativeWindow(struct wl_egl_window *window, struct wl
 WaylandNativeWindow::~WaylandNativeWindow()
 {
     std::list<WaylandNativeWindowBuffer *>::iterator it = m_bufList.begin();
-    for (; it != m_bufList.end(); it++)
-    {
-        WaylandNativeWindowBuffer* buf=*it;
-        if (buf->wlbuffer)
-            wl_buffer_destroy(buf->wlbuffer);
-        buf->wlbuffer = NULL;
-        buf->common.decRef(&buf->common);
-    }
+    destroyBuffers();
     if (frame_callback)
         wl_callback_destroy(frame_callback);
-    wl_registry_destroy(registry);
     wl_event_queue_destroy(wl_queue);
-    android_wlegl_destroy(m_android_wlegl);
+   if (m_window) {
+	    m_window->nativewindow = NULL;
+	    m_window->resize_callback = NULL;
+	    m_window->free_callback = NULL;
+    }
 }
 
 void WaylandNativeWindow::frame() {
@@ -221,10 +232,23 @@ void WaylandNativeWindow::frame() {
     HYBRIS_TRACE_END("wayland-platform", "frame_event", "");
 }
 
-
 // overloads from BaseNativeWindow
 int WaylandNativeWindow::setSwapInterval(int interval) {
     TRACE("interval:%i", interval);
+
+    if (interval < 0)
+        interval = 0;
+    if (interval > 1)
+        interval = 1;
+
+    HYBRIS_TRACE_BEGIN("wayland-platform", "swap_interval", "=%d", interval);
+
+    lock();
+    m_swap_interval = interval;
+    unlock();
+
+    HYBRIS_TRACE_END("wayland-platform", "swap_interval", "");
+
     return 0;
 }
 
@@ -241,7 +265,6 @@ static struct wl_buffer_listener wl_buffer_listener = {
 
 void WaylandNativeWindow::releaseBuffer(struct wl_buffer *buffer)
 {
-    lock();
     std::list<WaylandNativeWindowBuffer *>::iterator it = posted.begin();
 
     for (; it != posted.end(); it++)
@@ -256,7 +279,6 @@ void WaylandNativeWindow::releaseBuffer(struct wl_buffer *buffer)
         posted.erase(it);
         TRACE("released posted buffer: %p", buffer);
         pwnb->busy = 0;
-        pthread_cond_signal(&cond);
         unlock();
         return;
     }
@@ -288,15 +310,13 @@ void WaylandNativeWindow::releaseBuffer(struct wl_buffer *buffer)
     ++m_freeBufs;
     HYBRIS_TRACE_COUNTER("wayland-platform", "m_freeBufs", "%i", m_freeBufs);
     for (it = m_bufList.begin(); it != m_bufList.end(); it++)
-    {  
+    {
         (*it)->youngest = 0;
     }
-    wnb->youngest = 1; 
+    wnb->youngest = 1;
 
 
-    pthread_cond_signal(&cond);
     HYBRIS_TRACE_END("wayland-platform", "releaseBuffer", "-%p", wnb);
-    unlock();
 }
 
 
@@ -307,15 +327,17 @@ int WaylandNativeWindow::dequeueBuffer(BaseNativeWindowBuffer **buffer, int *fen
     TRACE("%p", buffer);
 
     lock();
+    readQueue(false);
+
     HYBRIS_TRACE_BEGIN("wayland-platform", "dequeueBuffer_wait_for_buffer", "");
 
     HYBRIS_TRACE_COUNTER("wayland-platform", "m_freeBufs", "%i", m_freeBufs);
 
     while (m_freeBufs==0) {
         HYBRIS_TRACE_COUNTER("wayland-platform", "m_freeBufs", "%i", m_freeBufs);
-
-        pthread_cond_wait(&cond,&mutex);
+        readQueue(true);
     }
+
     std::list<WaylandNativeWindowBuffer *>::iterator it = m_bufList.begin();
     for (; it != m_bufList.end(); it++)
     {
@@ -333,7 +355,7 @@ int WaylandNativeWindow::dequeueBuffer(BaseNativeWindowBuffer **buffer, int *fen
         it = m_bufList.begin();
         for (; it != m_bufList.end() && (*it)->busy; it++)
         {}
-        
+
     }
     if (it==m_bufList.end()) {
         unlock();
@@ -362,6 +384,7 @@ int WaylandNativeWindow::dequeueBuffer(BaseNativeWindowBuffer **buffer, int *fen
 
     wnb->busy = 1;
     *buffer = wnb;
+    queue.push_back(wnb);
     --m_freeBufs;
 
     HYBRIS_TRACE_COUNTER("wayland-platform", "m_freeBufs", "%i", m_freeBufs);
@@ -408,26 +431,16 @@ int WaylandNativeWindow::postBuffer(ANativeWindowBuffer* buffer)
 
     lock();
     wnb->busy = 1;
-    unlock();
-    /* XXX locking/something is a bit fishy here */
-    while (this->frame_callback && ret != -1) {
-        ret = wl_display_dispatch_queue(m_display, this->wl_queue);
-    }
+    ret = readQueue(false);
 
     if (ret < 0) {
-        TRACE("wl_display_dispatch_queue returned an error:%i", ret);
-        check_fatal_error(m_display);
+        unlock();
         return ret;
     }
 
-    lock();
-    this->frame_callback = wl_surface_frame(m_window->surface);
-    wl_callback_add_listener(this->frame_callback, &frame_listener, this);
-    wl_proxy_set_queue((struct wl_proxy *) this->frame_callback, this->wl_queue);
-
     if (wnb->wlbuffer == NULL)
     {
-        wnb->wlbuffer_from_native_handle(m_android_wlegl);
+        wnb->wlbuffer_from_native_handle(m_android_wlegl, m_display, wl_queue);
         TRACE("%p add listener with %p inside", wnb, wnb->wlbuffer);
         wl_buffer_add_listener(wnb->wlbuffer, &wl_buffer_listener, this);
         wl_proxy_set_queue((struct wl_proxy *) wnb->wlbuffer, this->wl_queue);
@@ -437,43 +450,125 @@ int WaylandNativeWindow::postBuffer(ANativeWindowBuffer* buffer)
     wl_surface_attach(m_window->surface, wnb->wlbuffer, 0, 0);
     wl_surface_damage(m_window->surface, 0, 0, wnb->width, wnb->height);
     wl_surface_commit(m_window->surface);
-    //--m_freeBufs;
-    //pthread_cond_signal(&cond);
+    wl_display_flush(m_display);
+
     posted.push_back(wnb);
     unlock();
 
     return NO_ERROR;
 }
 
-static int debugenvchecked = 0;
-
-int WaylandNativeWindow::queueBuffer(BaseNativeWindowBuffer* buffer, int fenceFd)
+int WaylandNativeWindow::readQueue(bool block)
 {
-    WaylandNativeWindowBuffer *wnb = (WaylandNativeWindowBuffer*) buffer;
     int ret = 0;
 
-    HYBRIS_TRACE_BEGIN("wayland-platform", "queueBuffer", "-%p", wnb);
+    if (++m_queueReads == 1) {
+        if (block) {
+            ret = wl_display_dispatch_queue(m_display, wl_queue);
+        } else {
+            ret = wl_display_dispatch_queue_pending(m_display, wl_queue);
+        }
+
+        // all threads waiting on the false branch will wake and return now, so we
+        // can safely set m_queueReads to 0 here instead of relying on every thread
+        // to decrement it. This prevents a race condition when a thread enters readQueue()
+        // before the one in this thread returns.
+        // The new thread would go in the false branch, and there would be no thread in the
+        // true branch, blocking the new thread and any other that will call readQueue in
+        // the future.
+        m_queueReads = 0;
+
+        pthread_cond_broadcast(&cond);
+
+        if (ret < 0) {
+            TRACE("wl_display_dispatch_queue returned an error");
+            check_fatal_error(m_display);
+            return ret;
+        }
+    } else if (block) {
+        while (m_queueReads > 0) {
+            pthread_cond_wait(&cond, &mutex);
+        }
+    }
+
+    return ret;
+}
+
+void WaylandNativeWindow::prepareSwap(EGLint *damage_rects, EGLint damage_n_rects)
+{
     lock();
-    wnb->busy = 1;
+    m_damage_rects = damage_rects;
+    m_damage_n_rects = damage_n_rects;
     unlock();
-    /* XXX locking/something is a bit fishy here */
-    HYBRIS_TRACE_BEGIN("wayland-platform", "queueBuffer_wait_for_frame_callback", "-%p", wnb);
+}
 
-    while (this->frame_callback && ret != -1) {
-        ret = wl_display_dispatch_queue(m_display, this->wl_queue);
-    }
+void WaylandNativeWindow::finishSwap()
+{
+    int ret = 0;
+    lock();
 
+    WaylandNativeWindowBuffer *wnb = queue.front();
+    if (!wnb) {
+        wnb = m_lastBuffer;
+    } else {
+        queue.pop_front();
+    }
+    assert(wnb);
+    m_lastBuffer = wnb;
+    wnb->busy = 1;
 
+    ret = readQueue(false);
+    if (this->frame_callback) {
+        do {
+            ret = readQueue(true);
+        } while (this->frame_callback && ret != -1);
+    }
     if (ret < 0) {
-        TRACE("wl_display_dispatch_queue returned an error");
         HYBRIS_TRACE_END("wayland-platform", "queueBuffer_wait_for_frame_callback", "-%p", wnb);
-        check_fatal_error(m_display);
-        return ret;
+        return;
+    }
+
+    if (wnb->wlbuffer == NULL)
+    {
+        wnb->init(m_android_wlegl, m_display, wl_queue);
+        TRACE("%p add listener with %p inside", wnb, wnb->wlbuffer);
+        wl_buffer_add_listener(wnb->wlbuffer, &wl_buffer_listener, this);
+        wl_proxy_set_queue((struct wl_proxy *) wnb->wlbuffer, this->wl_queue);
+    }
+
+    if (m_swap_interval > 0) {
+        this->frame_callback = wl_surface_frame(m_window->surface);
+        wl_callback_add_listener(this->frame_callback, &frame_listener, this);
+        wl_proxy_set_queue((struct wl_proxy *) this->frame_callback, this->wl_queue);
     }
 
-    HYBRIS_TRACE_END("wayland-platform", "queueBuffer_wait_for_frame_callback", "-%p", wnb);
+    wl_surface_attach(m_window->surface, wnb->wlbuffer, 0, 0);
+    wl_surface_damage(m_window->surface, 0, 0, wnb->width, wnb->height);
+    wl_surface_commit(m_window->surface);
+    // Some compositors, namely Weston, queue buffer release events instead
+    // of sending them immediately.  If a frame event is used, this should
+    // not be a problem.  Without a frame event, we need to send a sync
+    // request to ensure that they get flushed.
+    wl_callback_destroy(wl_display_sync(m_display));
+    wl_display_flush(m_display);
+    fronted.push_back(wnb);
+
+    m_window->attached_width = wnb->width;
+    m_window->attached_height = wnb->height;
+
+    m_damage_rects = NULL;
+    m_damage_n_rects = 0;
+    unlock();
+}
 
+static int debugenvchecked = 0;
 
+int WaylandNativeWindow::queueBuffer(BaseNativeWindowBuffer* buffer, int fenceFd)
+{
+    WaylandNativeWindowBuffer *wnb = (WaylandNativeWindowBuffer*) buffer;
+    int ret = 0;
+
+    HYBRIS_TRACE_BEGIN("wayland-platform", "queueBuffer", "-%p", wnb);
     lock();
 
     if (debugenvchecked == 0)
@@ -491,59 +586,17 @@ int WaylandNativeWindow::queueBuffer(BaseNativeWindowBuffer* buffer, int fenceFd
 
     }
 
-#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2
+#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=2 || ANDROID_VERSION_MAJOR>=5
     HYBRIS_TRACE_BEGIN("wayland-platform", "queueBuffer_waiting_for_fence", "-%p", wnb);
-    sync_wait(fenceFd, -1);
-    close(fenceFd);
-    HYBRIS_TRACE_END("wayland-platform", "queueBuffer_waiting_for_fence", "-%p", wnb);
-#endif
-
-    this->frame_callback = wl_surface_frame(m_window->surface);
-    wl_callback_add_listener(this->frame_callback, &frame_listener, this);
-    wl_proxy_set_queue((struct wl_proxy *) this->frame_callback, this->wl_queue);
-
-    if (wnb->wlbuffer == NULL)
+    if (fenceFd >= 0)
     {
-        wnb->wlbuffer_from_native_handle(m_android_wlegl);
-        TRACE("%p add listener with %p inside", wnb, wnb->wlbuffer);
-        wl_buffer_add_listener(wnb->wlbuffer, &wl_buffer_listener, this);
-        wl_proxy_set_queue((struct wl_proxy *) wnb->wlbuffer, this->wl_queue);
+        sync_wait(fenceFd, -1);
+        close(fenceFd);
     }
-    TRACE("%p DAMAGE AREA: %dx%d", wnb, wnb->width, wnb->height);
-    HYBRIS_TRACE_BEGIN("wayland-platform", "queueBuffer_attachdamagecommit", "-resource@%i", wl_proxy_get_id((struct wl_proxy *) wnb->wlbuffer));
-
-    wl_surface_attach(m_window->surface, wnb->wlbuffer, 0, 0);
-    wl_surface_damage(m_window->surface, 0, 0, wnb->width, wnb->height);
-    wl_surface_commit(m_window->surface);
-    wl_display_flush(m_display);
-    HYBRIS_TRACE_END("wayland-platform", "queueBuffer_attachdamagecommit", "-resource@%i", wl_proxy_get_id((struct wl_proxy *) wnb->wlbuffer));
+    HYBRIS_TRACE_END("wayland-platform", "queueBuffer_waiting_for_fence", "-%p", wnb);
+#endif
 
-    //--m_freeBufs;
-    //pthread_cond_signal(&cond);
-    fronted.push_back(wnb);
     HYBRIS_TRACE_COUNTER("wayland-platform", "fronted.size", "%i", fronted.size());
-
-    if (fronted.size() == m_bufList.size())
-    {
-        HYBRIS_TRACE_BEGIN("wayland-platform", "queueBuffer_wait_for_nonfronted_buffer", "-%p", wnb);
-
-        /* We have fronted all our buffers, let's wait for one of them to be free */
-        do {
-            unlock();
-            ret = wl_display_dispatch_queue(m_display, this->wl_queue);
-            lock();
-            if (ret == -1)
-            {
-                check_fatal_error(m_display);
-                break;
-            }
-            HYBRIS_TRACE_COUNTER("wayland-platform", "fronted.size", "%i", fronted.size());
-
-            if (fronted.size() != m_bufList.size())
-                break;
-        } while (1);
-        HYBRIS_TRACE_END("wayland-platform", "queueBuffer_wait_for_nonfronted_buffer", "-%p", wnb);
-    }
     HYBRIS_TRACE_END("wayland-platform", "queueBuffer", "-%p", wnb);
     unlock();
 
@@ -575,10 +628,17 @@ int WaylandNativeWindow::cancelBuffer(BaseNativeWindowBuffer* buffer, int fenceF
     }
     wnb->youngest = 1;
 
-    pthread_cond_signal(&cond);
+    if (m_queueReads != 0) {
+        // Some thread is waiting on wl_display_dispatch_queue(), possibly waiting for a wl_buffer.release
+        // event. Since we have now cancelled a buffer push an artificial event so that the dispatch returns
+        // and the thread can notice the cancelled buffer. This means there is a delay of one roundtrip,
+        // but I don't see other solution except having one dedicated thread for calling wl_display_dispatch_queue().
+        wl_callback_destroy(wl_display_sync(m_display));
+    }
 
     HYBRIS_TRACE_END("wayland-platform", "cancelBuffer", "-%p", wnb);
     unlock();
+
     return 0;
 }
 
@@ -614,7 +674,7 @@ unsigned int WaylandNativeWindow::queueLength() const {
 
 unsigned int WaylandNativeWindow::type() const {
     TRACE("");
-#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=3
+#if ANDROID_VERSION_MAJOR>=4 && ANDROID_VERSION_MINOR>=3 || ANDROID_VERSION_MAJOR>=5
     /* https://android.googlesource.com/platform/system/core/+/bcfa910611b42018db580b3459101c564f802552%5E!/ */
     return NATIVE_WINDOW_SURFACE;
 #else
@@ -644,6 +704,16 @@ void WaylandNativeWindow::destroyBuffer(WaylandNativeWindowBuffer* wnb)
     TRACE("wnb:%p", wnb);
 
     assert(wnb != NULL);
+
+    int ret = 0;
+    while (ret != -1 && wnb->creation_callback)
+        ret = wl_display_dispatch_queue(m_display, wl_queue);
+
+    if (wnb->creation_callback) {
+        wl_callback_destroy(wnb->creation_callback);
+        wnb->creation_callback = NULL;
+    }
+
     if (wnb->wlbuffer)
         wl_buffer_destroy(wnb->wlbuffer);
     wnb->wlbuffer = NULL;
@@ -659,6 +729,7 @@ void WaylandNativeWindow::destroyBuffers()
     for (; it!=m_bufList.end(); ++it)
     {
         destroyBuffer(*it);
+        it = m_bufList.erase(it);
     }
     m_bufList.clear();
     m_freeBufs = 0;
@@ -666,9 +737,15 @@ void WaylandNativeWindow::destroyBuffers()
 
 WaylandNativeWindowBuffer *WaylandNativeWindow::addBuffer() {
 
-    WaylandNativeWindowBuffer *wnb = new WaylandNativeWindowBuffer(m_alloc, m_width, m_height, m_format, m_usage);
+    WaylandNativeWindowBuffer *wnb;
+
+#ifndef HYBRIS_NO_SERVER_SIDE_BUFFERS