Merge lp:~mir-team/mir/android-eliminate-libui-dependency into lp:~mir-team/mir/trunk

[Kevin DuBois]

eliminate our depenendency on libui by (temporarily) porting FramebufferNativeWindow.

eliminate our depenendency on libui by (temporarily) porting FramebufferNativeWindow.

Porting the fb native window type we were using has many nice effects
1) our framebuffer deconstructs properly, which it wasn't before (makes us more responsive to ctrl-c on device)
2) we eliminate our dependency on libui
3) we reduce the amount of stuff operating over hybris
4) we make multithreaded-compositor branch landable for android

For what its worth, the MirNativeWindowType is in good enough shape (architecturally) to plug in a class that uses framebuffer windows. I chose to port over this class because I estimated the time it would take to create that class for MirNativeWindow would take longer than just a quick port, and I wanted to unblock alexandros's multithreaded compositor branch asap.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:509
http://jenkins.qa.ubuntu.com/job/mir-ci/88/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/89/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/89/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/88/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/mir-ci/91/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/92/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/92/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/91/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Looks sane (for imported code). But I'm not set up to prove it works (guess alf will tell me).

review: Approve

[Alexandros Frantzis (afrantzis)]

Works well on Nexus 4.

I guess this also allows us to remove the static display workaround in tests/integration-tests/graphics/android/test_buffer_integration.cpp, right?

review: Approve

=== modified file '3rd_party/CMakeLists.txt'
--- 3rd_party/CMakeLists.txt	2013-03-13 08:01:51 +0000
+++ 3rd_party/CMakeLists.txt	2013-03-15 00:18:23 +0000
@@ -24,6 +24,10 @@
 set(MIR_INPUT_ANDROID_COMPILE_FLAGS ${MIR_INPUT_ANDROID_COMPILE_FLAGS}
   PARENT_SCOPE)
 
+if (MIR_PLATFORM STREQUAL "android")
+  add_subdirectory(android-fbtype)
+endif()
+
 if (NOT MIR_DISABLE_INPUT)
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/android-deps)
   add_subdirectory(android-input)

=== modified file '3rd_party/android-deps/ui/FramebufferNativeWindow.h'
--- 3rd_party/android-deps/ui/FramebufferNativeWindow.h	2013-03-07 08:04:05 +0000
+++ 3rd_party/android-deps/ui/FramebufferNativeWindow.h	2013-03-15 00:18:23 +0000
@@ -33,10 +33,11 @@
 
 #include <ui/egl/android_natives.h>
 
+#include <mutex>
+#include <condition_variable>
+
 #define NUM_FRAME_BUFFERS  2
 
-extern "C" EGLNativeWindowType android_createDisplaySurface(void);
-
 // ---------------------------------------------------------------------------
 namespace android {
 // ---------------------------------------------------------------------------
@@ -46,11 +47,7 @@
 
 // ---------------------------------------------------------------------------
 
-class FramebufferNativeWindow 
-    : public EGLNativeBase<
-        ANativeWindow, 
-        FramebufferNativeWindow, 
-        LightRefBase<FramebufferNativeWindow> >
+class FramebufferNativeWindow : public ANativeWindow
 {
 public:
     FramebufferNativeWindow(); 
@@ -66,24 +63,25 @@
     // for debugging only
     int getCurrentBufferIndex() const;
 
+    ~FramebufferNativeWindow(); // this class cannot be overloaded
+
 private:
-    friend class LightRefBase<FramebufferNativeWindow>;    
-    ~FramebufferNativeWindow(); // this class cannot be overloaded
     static int setSwapInterval(ANativeWindow* window, int interval);
-    static int dequeueBuffer(ANativeWindow* window, ANativeWindowBuffer** buffer);
-    static int lockBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);
-    static int queueBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer);
+    static int dequeueBuffer(ANativeWindow* window, ANativeWindowBuffer** buffer, int*);
+    static int dequeueBuffer_DEPRECATED(ANativeWindow* window, ANativeWindowBuffer** buffer);
+    static int lockBuffer_DEPRECATED(ANativeWindow* window, ANativeWindowBuffer* buffer);
+    static int queueBuffer(ANativeWindow* window, ANativeWindowBuffer* buffer, int);
+    static int queueBuffer_DEPRECATED(ANativeWindow* window, ANativeWindowBuffer* buffer);
     static int query(const ANativeWindow* window, int what, int* value);
     static int perform(ANativeWindow* window, int operation, ...);
     
     framebuffer_device_t* fbDev;
     alloc_device_t* grDev;
 
-    sp<NativeBuffer> buffers[NUM_FRAME_BUFFERS];
-    sp<NativeBuffer> front;
+    NativeBuffer* buffers[NUM_FRAME_BUFFERS];
     
-    mutable Mutex mutex;
-    Condition mCondition;
+    std::mutex mutex;
+    std::condition_variable mCondition;
     int32_t mNumBuffers;
     int32_t mNumFreeBuffers;
     int32_t mBufferHead;

=== added directory '3rd_party/android-fbtype'
=== added file '3rd_party/android-fbtype/CMakeLists.txt'
--- 3rd_party/android-fbtype/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ 3rd_party/android-fbtype/CMakeLists.txt	2013-03-15 00:18:23 +0000
@@ -0,0 +1,11 @@
+# Don't be so strict on warnings etc as android code won't compile with them on.
+# A *big* number of warnings would ensue. Therefore locally define CMAKE_CXX_FLAGS
+# without things such as -Werror, -Wall, etc
+STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+STRING(REGEX REPLACE "-W[^ ]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+
+add_library(
+  3rd_party_fbtype STATIC
+  
+  FramebufferNativeWindow.cpp
+)

=== added file '3rd_party/android-fbtype/FramebufferNativeWindow.cpp'
--- 3rd_party/android-fbtype/FramebufferNativeWindow.cpp	1970-01-01 00:00:00 +0000
+++ 3rd_party/android-fbtype/FramebufferNativeWindow.cpp	2013-03-15 00:18:23 +0000
@@ -0,0 +1,342 @@
+/* 
+**
+** Copyright 2007 The Android Open Source Project
+**
+** Licensed under the Apache License Version 2.0(the "License"); 
+** you may not use this file except in compliance with the License. 
+** You may obtain a copy of the License at 
+**
+**     http://www.apache.org/licenses/LICENSE-2.0 
+**
+** Unless required by applicable law or agreed to in writing software 
+** distributed under the License is distributed on an "AS IS" BASIS 
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND either express or implied. 
+** See the License for the specific language governing permissions and 
+** limitations under the License.
+*/
+
+//TODO: kdub remove this entire file and use mir native window types
+
+#define LOG_TAG "FramebufferNativeWindow"
+#define SYNC_IOC_WAIT 0x40043E00
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+
+//#include <cutils/log.h>
+//#include <cutils/atomic.h>
+//#include <utils/threads.h>
+#include <utils/RefBase.h>
+
+//#include <ui/ANativeObjectBase.h>
+//#include <ui/Fence.h>
+#include <ui/FramebufferNativeWindow.h>
+#include <ui/Rect.h>
+
+#include <EGL/egl.h>
+
+#include <hardware/hardware.h>
+#include <hardware/gralloc.h>
+
+// ----------------------------------------------------------------------------
+namespace android {
+// ----------------------------------------------------------------------------
+
+static void incRef(android_native_base_t*)
+{
+}
+class NativeBuffer : public ANativeWindowBuffer 
+{
+public:
+
+
+    NativeBuffer(int w, int h, int f, int u)  /*: BASE() */ 
+    {
+        ANativeWindowBuffer::width  = w;
+        ANativeWindowBuffer::height = h;
+        ANativeWindowBuffer::format = f;
+        ANativeWindowBuffer::usage  = u;
+
+        common.incRef = incRef;
+        common.decRef = incRef; 
+    }
+    ~NativeBuffer() { }; // this class cannot be overloaded
+};
+
+/*
+ * This implements the (main) framebuffer management. This class is used
+ * mostly by SurfaceFlinger, but also by command line GL application.
+ * 
+ * In fact this is an implementation of ANativeWindow on top of
+ * the framebuffer.
+ * 
+ * Currently it is pretty simple, it manages only two buffers (the front and 
+ * back buffer).
+ * 
+ */
+
+FramebufferNativeWindow::FramebufferNativeWindow() 
+    :/* BASE(), */ fbDev(0), grDev(0), mUpdateOnDemand(false)
+{
+    hw_module_t const* module;
+
+    if (hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module) == 0) {
+        int err;
+        int i;
+        err = framebuffer_open(module, &fbDev);
+        
+        err = gralloc_open(module, &grDev);
+
+        // bail out if we can't initialize the modules
+        if (!fbDev || !grDev)
+            return;
+        
+        mUpdateOnDemand = (fbDev->setUpdateRect != 0);
+        
+        mNumBuffers = 2; //fbDev->numFramebuffers;
+
+        mNumFreeBuffers = mNumBuffers;
+        mBufferHead = mNumBuffers-1;
+
+        for (i = 0; i < mNumBuffers; i++)
+        {
+                buffers[i] = new NativeBuffer(
+                        fbDev->width, fbDev->height, fbDev->format, GRALLOC_USAGE_HW_FB);
+        }
+
+        for (i = 0; i < mNumBuffers; i++)
+        {
+                err = grDev->alloc(grDev,
+                        fbDev->width, fbDev->height, fbDev->format,
+                        GRALLOC_USAGE_HW_FB, &buffers[i]->handle, &buffers[i]->stride);
+
+
+                if (err)
+                {
+                        mNumBuffers = i;
+                        mNumFreeBuffers = i;
+                        mBufferHead = mNumBuffers-1;
+                        break;
+                }
+        }
+
+        const_cast<uint32_t&>(ANativeWindow::flags) = fbDev->flags; 
+        const_cast<float&>(ANativeWindow::xdpi) = fbDev->xdpi;
+        const_cast<float&>(ANativeWindow::ydpi) = fbDev->ydpi;
+        const_cast<int&>(ANativeWindow::minSwapInterval) = 
+            fbDev->minSwapInterval;
+        const_cast<int&>(ANativeWindow::maxSwapInterval) = 
+            fbDev->maxSwapInterval;
+    }
+
+    common.incRef = incRef;
+    common.decRef = incRef; 
+    ANativeWindow::setSwapInterval = setSwapInterval;
+    ANativeWindow::dequeueBuffer = dequeueBuffer;
+    ANativeWindow::queueBuffer = queueBuffer;
+    ANativeWindow::query = query;
+    ANativeWindow::perform = perform;
+    ANativeWindow::cancelBuffer = NULL;
+
+    ANativeWindow::dequeueBuffer_DEPRECATED = dequeueBuffer_DEPRECATED;
+    ANativeWindow::lockBuffer_DEPRECATED = lockBuffer_DEPRECATED;
+    ANativeWindow::queueBuffer_DEPRECATED = queueBuffer_DEPRECATED;
+}
+
+FramebufferNativeWindow::~FramebufferNativeWindow() 
+{
+    if (grDev) {
+        for(int i = 0; i < mNumBuffers; i++) {
+            if (buffers[i] != NULL) {
+                grDev->free(grDev, buffers[i]->handle);
+                delete buffers[i];
+            }
+        }
+        gralloc_close(grDev);
+    }
+
+    if (fbDev) {
+        framebuffer_close(fbDev);
+    }
+}
+
+status_t FramebufferNativeWindow::setUpdateRectangle(const Rect& r) 
+{
+    if (!mUpdateOnDemand) {
+        return INVALID_OPERATION;
+    }
+    return fbDev->setUpdateRect(fbDev, r.left, r.top, r.width(), r.height());
+}
+
+status_t FramebufferNativeWindow::compositionComplete()
+{
+    if (fbDev->compositionComplete) {
+        return fbDev->compositionComplete(fbDev);
+    }
+    return INVALID_OPERATION;
+}
+
+int FramebufferNativeWindow::setSwapInterval(
+        ANativeWindow* window, int interval) 
+{
+    framebuffer_device_t* fb =  static_cast<FramebufferNativeWindow*>(window)->fbDev;
+    return fb->setSwapInterval(fb, interval);
+}
+
+void FramebufferNativeWindow::dump(String8& result) {
+    if (fbDev->common.version >= 1 && fbDev->dump) {
+        const size_t SIZE = 4096;
+        char buffer[SIZE];
+
+        fbDev->dump(fbDev, buffer, SIZE);
+        result.append(buffer);
+    }
+}
+
+// only for debugging / logging
+int FramebufferNativeWindow::getCurrentBufferIndex() const
+{
+    return 0;
+}
+
+int FramebufferNativeWindow::dequeueBuffer_DEPRECATED(ANativeWindow* window, 
+        ANativeWindowBuffer** buffer)
+{
+    int fenceFd = -1;
+    int result = dequeueBuffer(window, buffer, &fenceFd);
+    return result;
+}
+
+int FramebufferNativeWindow::dequeueBuffer(ANativeWindow* window, 
+        ANativeWindowBuffer** buffer, int* fenceFd)
+{
+    FramebufferNativeWindow* self = static_cast<FramebufferNativeWindow*>(window);
+
+    std::unique_lock<std::mutex> lk(self->mutex);
+    while (self->mNumFreeBuffers < 2) {
+        self->mCondition.wait(lk);
+    }
+
+    framebuffer_device_t* fb = self->fbDev;
+
+    int index = self->mBufferHead++;
+    if (self->mBufferHead >= self->mNumBuffers)
+        self->mBufferHead = 0;
+
+    // get this buffer
+    self->mNumFreeBuffers--;
+    self->mCurrentBufferIndex = index;
+
+    *buffer = self->buffers[index];
+    *fenceFd = -1;
+
+    return 0;
+}
+
+int FramebufferNativeWindow::lockBuffer_DEPRECATED(ANativeWindow* window, 
+        ANativeWindowBuffer* buffer)
+{
+    return NO_ERROR;
+}
+
+int FramebufferNativeWindow::queueBuffer_DEPRECATED(ANativeWindow* window, 
+        ANativeWindowBuffer* buffer)
+{
+    return queueBuffer(window, buffer, -1);
+}
+
+int FramebufferNativeWindow::queueBuffer(ANativeWindow* window, 
+        ANativeWindowBuffer* buffer, int fenceFd)
+{
+    FramebufferNativeWindow* self = static_cast<FramebufferNativeWindow*>(window);
+    std::unique_lock<std::mutex> lk(self->mutex);
+
+    framebuffer_device_t* fb = self->fbDev;
+    buffer_handle_t handle = static_cast<NativeBuffer*>(buffer)->handle;
+
+    if (fenceFd > 0)
+    {
+        int timeout = -1;
+        ioctl(fenceFd, SYNC_IOC_WAIT, &timeout);
+        close(fenceFd);
+    }
+
+    const int index = self->mCurrentBufferIndex;
+    int res = fb->post(fb, handle);
+    self->mNumFreeBuffers++;
+    self->mCondition.notify_all();
+    return res;
+}
+
+int FramebufferNativeWindow::query(const ANativeWindow* window,
+        int what, int* value) 
+{
+    auto fbwin = const_cast<ANativeWindow*>(window);
+    FramebufferNativeWindow* self = static_cast<FramebufferNativeWindow*>(fbwin);
+    std::unique_lock<std::mutex> lk(self->mutex);
+
+    framebuffer_device_t* fb = self->fbDev;
+    switch (what) {
+        case NATIVE_WINDOW_WIDTH:
+            *value = fb->width;
+            return NO_ERROR;
+        case NATIVE_WINDOW_HEIGHT:
+            *value = fb->height;
+            return NO_ERROR;
+        case NATIVE_WINDOW_FORMAT:
+            *value = fb->format;
+            return NO_ERROR;
+        case NATIVE_WINDOW_CONCRETE_TYPE:
+            *value = NATIVE_WINDOW_FRAMEBUFFER;
+            return NO_ERROR;
+        case NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER:
+            *value = 0;
+            return NO_ERROR;
+        case NATIVE_WINDOW_DEFAULT_WIDTH:
+            *value = fb->width;
+            return NO_ERROR;
+        case NATIVE_WINDOW_DEFAULT_HEIGHT:
+            *value = fb->height;
+            return NO_ERROR;
+        case NATIVE_WINDOW_TRANSFORM_HINT:
+            *value = 0;
+            return NO_ERROR;
+    }
+    *value = 0;
+    return BAD_VALUE;
+}
+
+int FramebufferNativeWindow::perform(ANativeWindow* window,
+        int operation, ...)
+{
+    switch (operation) {
+        case NATIVE_WINDOW_CONNECT:
+        case NATIVE_WINDOW_DISCONNECT:
+        case NATIVE_WINDOW_SET_USAGE:
+        case NATIVE_WINDOW_SET_BUFFERS_GEOMETRY:
+        case NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS:
+        case NATIVE_WINDOW_SET_BUFFERS_FORMAT:
+        case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM:
+        case NATIVE_WINDOW_API_CONNECT:
+        case NATIVE_WINDOW_API_DISCONNECT:
+            // TODO: we should implement these
+            return NO_ERROR;
+
+        case NATIVE_WINDOW_LOCK:
+        case NATIVE_WINDOW_UNLOCK_AND_POST:
+        case NATIVE_WINDOW_SET_CROP:
+        case NATIVE_WINDOW_SET_BUFFER_COUNT:
+        case NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP:
+        case NATIVE_WINDOW_SET_SCALING_MODE:
+            return INVALID_OPERATION;
+    }
+    return NAME_NOT_FOUND;
+}
+
+// ----------------------------------------------------------------------------
+}; // namespace android
+// ----------------------------------------------------------------------------

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-14 05:44:41 +0000
+++ CMakeLists.txt	2013-03-15 00:18:23 +0000
@@ -142,7 +142,6 @@
   add_definitions( -DANDROID )
  
   find_package( LibHardware REQUIRED )
-  find_package( AndroidUI REQUIRED )
 
   #ctest does not work for android, so turn test discovery off
   set(DISABLE_GTEST_TEST_DISCOVERY ON)

=== removed file 'cmake/FindAndroidUI.cmake'
--- cmake/FindAndroidUI.cmake	2013-03-07 08:04:05 +0000
+++ cmake/FindAndroidUI.cmake	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-# Variables defined by this module:
-#   LIBHARDWARE_FOUND
-#   LIBHARDWARE_INCLUDE_DIRS
-#   LIBHARDWARE_LIBRARIES
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-find_path(ANDROID_UI_INCLUDE_DIR
-   NAMES         ui/FramebufferNativeWindow.h
-                 pixelflinger/pixelflinger.h
-                 pixelflinger/format.h
-                 cutils/atomic.h
-                 utils/threads.h
-                 utils/String8.h
-                 utils/Errors.h
-                 utils/RefBase.h
-                 utils/Timers.h
-                 utils/SharedBuffer.h
-                 utils/Unicode.h
-                 utils/TypeHelpers.h
-                 utils/StrongPointer.h
-                 ui/Rect.h
-                 ui/Point.h
-                 ui/egl/android_natives.h
-
-                 #we keep these headers in-tree, so search in-tree
-                 NO_CMAKE_FIND_ROOT_PATH
-   )
-
-# we are using a hybris/chroot compile, so libui functions are linked via hybris.
-# hybris currently (confusingly) compiles the symbols we need for libui.so into libEGL.so (this should be corrected in the hybris project)
-if (EGL_FOUND)
-  set(ANDROID_UI_LIBRARY ${EGL_LIBRARIES})
-else()
-  set(ANDROID_UI_LIBRARY)
-  set(LIBHARDWARE_FOUND false)
-endif() 
-
-set(ANDROID_UI_LIBRARIES ${ANDROID_UI_LIBRARY})
-set(ANDROID_UI_INCLUDE_DIRS ${ANDROID_UI_INCLUDE_DIR})
-
-# handle the QUIETLY and REQUIRED arguments and set ANDROID_UI_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(ANDROID_UI DEFAULT_MSG
-                                  ANDROID_UI_LIBRARY ANDROID_UI_INCLUDE_DIR)
-
-mark_as_advanced(ANDROID_UI_INCLUDE_DIR ANDROID_UI_LIBRARY )

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2013-03-13 17:28:34 +0000
+++ src/client/CMakeLists.txt	2013-03-15 00:18:23 +0000
@@ -49,7 +49,7 @@
 endif()
 
 if( MIR_PLATFORM STREQUAL "android")
-include_directories( ${LIBHARDWARE_INCLUDE_DIRS} ${ANDROID_UI_INCLUDE_DIRS})
+include_directories(${LIBHARDWARE_INCLUDE_DIRS})
 set(
   CLIENT_SOURCES
 

=== modified file 'src/server/graphics/CMakeLists.txt'
--- src/server/graphics/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ src/server/graphics/CMakeLists.txt	2013-03-15 00:18:23 +0000
@@ -3,7 +3,7 @@
 include_directories(${GLESv2_INCLUDE_DIRS})
 
 if (MIR_PLATFORM STREQUAL "android")
-  include_directories( ${LIBHARDWARE_INCLUDE_DIRS} ${ANDROID_UI_INCLUDE_DIRS})
+  include_directories(${LIBHARDWARE_INCLUDE_DIRS})
   add_subdirectory(android/)
 endif()
 

=== modified file 'src/server/graphics/android/CMakeLists.txt'
--- src/server/graphics/android/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ src/server/graphics/android/CMakeLists.txt	2013-03-15 00:18:23 +0000
@@ -1,6 +1,5 @@
 include_directories(
     ${LIBHARDWARE_INCLUDE_DIRS}
-    ${ANDROID_UI_INCLUDE_DIRS}
     ${EGL_INCLUDE_DIRS}
     ${GLESv2_INCLUDE_DIRS}
 )
@@ -21,8 +20,9 @@
   mirplatformgraphics
   mircompositor
 
+  3rd_party_fbtype
+
   ${LIBHARDWARE_LIBRARIES}
-  ${ANDROID_UI_LIBRARIES}
   ${EGL_LDFLAGS} ${EGL_LIBRARIES}
   ${GLESv2_LDFLAGS} ${GLESv2_LIBRARIES}
 )

=== modified file 'src/server/graphics/android/android_platform.cpp'
--- src/server/graphics/android/android_platform.cpp	2013-03-07 08:04:05 +0000
+++ src/server/graphics/android/android_platform.cpp	2013-03-15 00:18:23 +0000
@@ -40,14 +40,10 @@
     return std::make_shared<mga::AndroidBufferAllocator>();
 }
 
-/* note: gralloc seems to choke when this is opened/closed more than once per process. must investigate drivers further */
 std::shared_ptr<mg::Display> mga::AndroidPlatform::create_display()
 {
-    auto android_window = std::shared_ptr<ANativeWindow>(android_createDisplaySurface());
-    if (!android_window.get())
-        BOOST_THROW_EXCEPTION(std::runtime_error("could not open FB window"));
+    auto android_window = std::make_shared< ::android::FramebufferNativeWindow>();
     auto window = std::make_shared<mga::AndroidFramebufferWindow> (android_window);
-
     return std::make_shared<mga::AndroidDisplay>(window);
 }
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-03-13 07:41:46 +0000
+++ tests/CMakeLists.txt	2013-03-15 00:18:23 +0000
@@ -25,7 +25,7 @@
 include_directories(${PROJECT_SOURCE_DIR}/include/test)
 
 if (MIR_PLATFORM STREQUAL "android")
-  include_directories( ${LIBHARDWARE_INCLUDE_DIRS} ${ANDROID_UI_INCLUDE_DIRS})
+  include_directories( ${LIBHARDWARE_INCLUDE_DIRS})
 endif()
 
 add_subdirectory(acceptance-tests/)