ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 128fcea1: Merge "Fix include paths" into jb-mr2-dev

Browse Source 
* commit '128fcea1c6f8b5f66a5d88a80789e65aac798416':
  Fix include paths
This commit is contained in:
Mathias Agopian 2013-04-02 16:40:45 -07:00 committed by Android Git Automerger
commit b7648000c3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
View File

@ -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)

7
services/surfaceflinger/DisplayHardware/HWComposer.cpp
View File

@ -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 {