Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 128fcea1 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

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

parents 263e8cb2 33ceeb32

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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

+4 −3
Original line number Diff line number Diff line
@@ -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 {