Bug 914554 - Remove a redundant GraphicBufferAlloc.cpp from B2G. r=mwu

widget/gonk/libdisplay/GonkDisplayJB.cpp

@@ -18,6 +18,7 @@
 #include <gui/SurfaceTextureClient.h>
 #else
 #include <gui/Surface.h>
+#include <gui/GraphicBufferAlloc.h>
 #endif
 
 #include <hardware/hardware.h>
@@ -25,7 +26,9 @@
 #include <hardware/power.h>
 #include <suspend/autosuspend.h>
 
+#if ANDROID_VERSION == 17
 #include "GraphicBufferAlloc.h"
+#endif
 #include "BootAnimation.h"
 
 using namespace android;

widget/gonk/libdisplay/Makefile.in

@@ -27,6 +27,7 @@ DEFINES += -DXPCOM_GLUE
 LOCAL_INCLUDES += \
 	-I$(ANDROID_SOURCE)/hardware/libhardware/include \
 	-I$(ANDROID_SOURCE)/hardware/libhardware_legacy/include \
+	-I$(ANDROID_SOURCE)/frameworks/native/include/gui \
 	-I$(ANDROID_SOURCE)/frameworks/native/opengl/include \
 	-I$(ANDROID_SOURCE)/system/core/libsuspend/include \
 	-I$(srcdir) \

widget/gonk/libdisplay/moz.build

@@ -20,7 +20,12 @@ CPP_SOURCES += [
     'BootAnimation.cpp',
 ]
 
-if CONFIG['ANDROID_VERSION'] >= '17':
+if CONFIG['ANDROID_VERSION'] >= '18':
+    CPP_SOURCES += [
+        'FramebufferSurface.cpp',
+        'GonkDisplayJB.cpp',
+    ]
+elif CONFIG['ANDROID_VERSION'] == '17':
     CPP_SOURCES += [
         'FramebufferSurface.cpp',
         'GraphicBufferAlloc.cpp',