commit 128fcea1c6f8b5f66a5d88a80789e65aac798416
author Mathias Agopian <mathias@google.com> Tue Apr 02 23:20:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 02 23:20:15 2013 +0000
tree 48ccc98e5bab613186b4d52aa41b5d9f2131467b
parent 263e8cb29ce9b3c02dd417b9ee57d6d64d895e7f
parent 33ceeb32582739dd74e404593d9ddf8adf5100bb

Merge "Fix include paths" into jb-mr2-dev

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
index 1936893..54a3ce8 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
@@ -33,8 +33,8 @@
 #include <gui/GraphicBufferAlloc.h>
 #include <ui/GraphicBuffer.h>
 
-#include "DisplayHardware/FramebufferSurface.h"
-#include "DisplayHardware/HWComposer.h"
+#include "FramebufferSurface.h"
+#include "HWComposer.h"
 
 #ifndef NUM_FRAMEBUFFER_SURFACE_BUFFERS
 #define NUM_FRAMEBUFFER_SURFACE_BUFFERS (2)

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 497593b..a68ddd8 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include <utils/CallStack.h>
 #include <utils/Errors.h>
 #include <utils/misc.h>
 #include <utils/String8.h>
@@ -40,10 +41,10 @@
 #include <cutils/log.h>
 #include <cutils/properties.h>
 
-#include "Layer.h"           // needed only for debugging
 #include "HWComposer.h"
-#include "SurfaceFlinger.h"
-#include <utils/CallStack.h>
+
+#include "../Layer.h"           // needed only for debugging
+#include "../SurfaceFlinger.h"
 
 namespace android {