diff options
33 files changed, 91 insertions, 102 deletions
diff --git a/include/gui/BufferQueue.h b/include/gui/BufferQueue.h index 039e7b0..8c21a28 100644 --- a/include/gui/BufferQueue.h +++ b/include/gui/BufferQueue.h @@ -19,9 +19,9 @@ #include <EGL/egl.h> +#include <gui/IGraphicBufferAlloc.h> #include <gui/ISurfaceTexture.h> -#include <surfaceflinger/IGraphicBufferAlloc.h> #include <ui/GraphicBuffer.h> #include <utils/String8.h> diff --git a/include/surfaceflinger/IGraphicBufferAlloc.h b/include/gui/IGraphicBufferAlloc.h index d3b2062..cee41d9 100644 --- a/include/surfaceflinger/IGraphicBufferAlloc.h +++ b/include/gui/IGraphicBufferAlloc.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef ANDROID_SF_IGRAPHIC_BUFFER_ALLOC_H -#define ANDROID_SF_IGRAPHIC_BUFFER_ALLOC_H +#ifndef ANDROID_GUI_IGRAPHIC_BUFFER_ALLOC_H +#define ANDROID_GUI_IGRAPHIC_BUFFER_ALLOC_H #include <stdint.h> #include <sys/types.h> -#include <utils/RefBase.h> - #include <binder/IInterface.h> +#include <ui/PixelFormat.h> +#include <utils/RefBase.h> namespace android { // ---------------------------------------------------------------------------- @@ -55,4 +55,4 @@ public: }; // namespace android -#endif // ANDROID_SF_IGRAPHIC_BUFFER_ALLOC_H +#endif // ANDROID_GUI_IGRAPHIC_BUFFER_ALLOC_H diff --git a/include/surfaceflinger/ISurface.h b/include/gui/ISurface.h index 5fdf234..c0ff9fc 100644 --- a/include/surfaceflinger/ISurface.h +++ b/include/gui/ISurface.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_SF_ISURFACE_H -#define ANDROID_SF_ISURFACE_H +#ifndef ANDROID_GUI_ISURFACE_H +#define ANDROID_GUI_ISURFACE_H #include <stdint.h> #include <sys/types.h> @@ -61,4 +61,4 @@ public: }; // namespace android -#endif // ANDROID_SF_ISURFACE_H +#endif // ANDROID_GUI_ISURFACE_H diff --git a/include/surfaceflinger/ISurfaceComposer.h b/include/gui/ISurfaceComposer.h index 58fd89d..f3c0ecb 100644 --- a/include/surfaceflinger/ISurfaceComposer.h +++ b/include/gui/ISurfaceComposer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_SF_ISURFACE_COMPOSER_H -#define ANDROID_SF_ISURFACE_COMPOSER_H +#ifndef ANDROID_GUI_ISURFACE_COMPOSER_H +#define ANDROID_GUI_ISURFACE_COMPOSER_H #include <stdint.h> #include <sys/types.h> @@ -27,8 +27,8 @@ #include <ui/PixelFormat.h> -#include <surfaceflinger/ISurfaceComposerClient.h> -#include <surfaceflinger/IGraphicBufferAlloc.h> +#include <gui/IGraphicBufferAlloc.h> +#include <gui/ISurfaceComposerClient.h> namespace android { // ---------------------------------------------------------------------------- @@ -171,4 +171,4 @@ public: }; // namespace android -#endif // ANDROID_SF_ISURFACE_COMPOSER_H +#endif // ANDROID_GUI_ISURFACE_COMPOSER_H diff --git a/include/surfaceflinger/ISurfaceComposerClient.h b/include/gui/ISurfaceComposerClient.h index 02cabc1..c793933 100644 --- a/include/surfaceflinger/ISurfaceComposerClient.h +++ b/include/gui/ISurfaceComposerClient.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_SF_ISURFACE_COMPOSER_CLIENT_H -#define ANDROID_SF_ISURFACE_COMPOSER_CLIENT_H +#ifndef ANDROID_GUI_ISURFACE_COMPOSER_CLIENT_H +#define ANDROID_GUI_ISURFACE_COMPOSER_CLIENT_H #include <stdint.h> #include <sys/types.h> @@ -27,7 +27,7 @@ #include <ui/PixelFormat.h> -#include <surfaceflinger/ISurface.h> +#include <gui/ISurface.h> namespace android { @@ -81,4 +81,4 @@ public: }; // namespace android -#endif // ANDROID_SF_ISURFACE_COMPOSER_CLIENT_H +#endif // ANDROID_GUI_ISURFACE_COMPOSER_CLIENT_H diff --git a/include/surfaceflinger/Surface.h b/include/gui/Surface.h index 06eff8a..1f90c59 100644 --- a/include/surfaceflinger/Surface.h +++ b/include/gui/Surface.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_SF_SURFACE_H -#define ANDROID_SF_SURFACE_H +#ifndef ANDROID_GUI_SURFACE_H +#define ANDROID_GUI_SURFACE_H #include <stdint.h> #include <sys/types.h> @@ -28,9 +28,8 @@ #include <ui/Region.h> #include <gui/SurfaceTextureClient.h> - -#include <surfaceflinger/ISurface.h> -#include <surfaceflinger/ISurfaceComposerClient.h> +#include <gui/ISurface.h> +#include <gui/ISurfaceComposerClient.h> #define ANDROID_VIEW_SURFACE_JNI_ID "mNativeSurface" @@ -173,4 +172,4 @@ private: }; // namespace android -#endif // ANDROID_SF_SURFACE_H +#endif // ANDROID_GUI_SURFACE_H diff --git a/include/surfaceflinger/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h index 99affda..d971031 100644 --- a/include/surfaceflinger/SurfaceComposerClient.h +++ b/include/gui/SurfaceComposerClient.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_SF_SURFACE_COMPOSER_CLIENT_H -#define ANDROID_SF_SURFACE_COMPOSER_CLIENT_H +#ifndef ANDROID_GUI_SURFACE_COMPOSER_CLIENT_H +#define ANDROID_GUI_SURFACE_COMPOSER_CLIENT_H #include <stdint.h> #include <sys/types.h> @@ -29,7 +29,7 @@ #include <ui/PixelFormat.h> -#include <surfaceflinger/Surface.h> +#include <gui/Surface.h> namespace android { @@ -174,4 +174,4 @@ public: // --------------------------------------------------------------------------- }; // namespace android -#endif // ANDROID_SF_SURFACE_COMPOSER_CLIENT_H +#endif // ANDROID_GUI_SURFACE_COMPOSER_CLIENT_H diff --git a/include/private/surfaceflinger/LayerState.h b/include/private/gui/LayerState.h index 3eb5c99..ca277e0 100644 --- a/include/private/surfaceflinger/LayerState.h +++ b/include/private/gui/LayerState.h @@ -23,8 +23,7 @@ #include <utils/Errors.h> #include <ui/Region.h> - -#include <surfaceflinger/ISurface.h> +#include <gui/ISurface.h> namespace android { diff --git a/include/private/surfaceflinger/SharedBufferStack.h b/include/private/gui/SharedBufferStack.h index 0da03d1..0da03d1 100644 --- a/include/private/surfaceflinger/SharedBufferStack.h +++ b/include/private/gui/SharedBufferStack.h diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp index f4214c7..20c4e3a 100644 --- a/libs/gui/BufferQueue.cpp +++ b/libs/gui/BufferQueue.cpp @@ -24,8 +24,8 @@ #include <EGL/eglext.h> #include <gui/BufferQueue.h> +#include <gui/ISurfaceComposer.h> #include <private/gui/ComposerService.h> -#include <surfaceflinger/ISurfaceComposer.h> #include <utils/Log.h> #include <gui/SurfaceTexture.h> diff --git a/libs/gui/DisplayEventReceiver.cpp b/libs/gui/DisplayEventReceiver.cpp index 6a4763d..a6790ad 100644 --- a/libs/gui/DisplayEventReceiver.cpp +++ b/libs/gui/DisplayEventReceiver.cpp @@ -21,11 +21,10 @@ #include <gui/BitTube.h> #include <gui/DisplayEventReceiver.h> #include <gui/IDisplayEventConnection.h> +#include <gui/ISurfaceComposer.h> #include <private/gui/ComposerService.h> -#include <surfaceflinger/ISurfaceComposer.h> - // --------------------------------------------------------------------------- namespace android { diff --git a/libs/gui/IGraphicBufferAlloc.cpp b/libs/gui/IGraphicBufferAlloc.cpp index 30f8d00..a70a5e8 100644 --- a/libs/gui/IGraphicBufferAlloc.cpp +++ b/libs/gui/IGraphicBufferAlloc.cpp @@ -24,7 +24,7 @@ #include <ui/GraphicBuffer.h> -#include <surfaceflinger/IGraphicBufferAlloc.h> +#include <gui/IGraphicBufferAlloc.h> // --------------------------------------------------------------------------- diff --git a/libs/gui/ISurface.cpp b/libs/gui/ISurface.cpp index 96155d7..c2ea183 100644 --- a/libs/gui/ISurface.cpp +++ b/libs/gui/ISurface.cpp @@ -22,8 +22,8 @@ #include <binder/Parcel.h> +#include <gui/ISurface.h> #include <gui/ISurfaceTexture.h> -#include <surfaceflinger/ISurface.h> namespace android { diff --git a/libs/gui/ISurfaceComposer.cpp b/libs/gui/ISurfaceComposer.cpp index 95b2379..1f1794c 100644 --- a/libs/gui/ISurfaceComposer.cpp +++ b/libs/gui/ISurfaceComposer.cpp @@ -25,16 +25,14 @@ #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> -#include <private/surfaceflinger/LayerState.h> - -#include <surfaceflinger/ISurfaceComposer.h> - #include <gui/BitTube.h> #include <gui/IDisplayEventConnection.h> +#include <gui/ISurfaceComposer.h> +#include <gui/ISurfaceTexture.h> -#include <ui/DisplayInfo.h> +#include <private/gui/LayerState.h> -#include <gui/ISurfaceTexture.h> +#include <ui/DisplayInfo.h> #include <utils/Log.h> diff --git a/libs/gui/ISurfaceComposerClient.cpp b/libs/gui/ISurfaceComposerClient.cpp index 8fe96b1..ca9ed5b 100644 --- a/libs/gui/ISurfaceComposerClient.cpp +++ b/libs/gui/ISurfaceComposerClient.cpp @@ -29,9 +29,9 @@ #include <ui/Point.h> #include <ui/Rect.h> -#include <surfaceflinger/ISurface.h> -#include <surfaceflinger/ISurfaceComposerClient.h> -#include <private/surfaceflinger/LayerState.h> +#include <gui/ISurface.h> +#include <gui/ISurfaceComposerClient.h> +#include <private/gui/LayerState.h> // --------------------------------------------------------------------------- diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 87901e8..224c305 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -16,8 +16,8 @@ #include <utils/Errors.h> #include <binder/Parcel.h> -#include <private/surfaceflinger/LayerState.h> -#include <surfaceflinger/ISurfaceComposerClient.h> +#include <gui/ISurfaceComposerClient.h> +#include <private/gui/LayerState.h> namespace android { diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index 337950c..72b27ed 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -28,16 +28,15 @@ #include <binder/IPCThreadState.h> -#include <gui/SurfaceTextureClient.h> - #include <ui/DisplayInfo.h> #include <ui/GraphicBuffer.h> #include <ui/Rect.h> -#include <surfaceflinger/ISurface.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/Surface.h> -#include <surfaceflinger/SurfaceComposerClient.h> +#include <gui/ISurface.h> +#include <gui/ISurfaceComposer.h> +#include <gui/Surface.h> +#include <gui/SurfaceComposerClient.h> +#include <gui/SurfaceTextureClient.h> namespace android { diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp index 699438c..ceb1ba6 100644 --- a/libs/gui/SurfaceComposerClient.cpp +++ b/libs/gui/SurfaceComposerClient.cpp @@ -31,15 +31,14 @@ #include <ui/DisplayInfo.h> -#include <surfaceflinger/ISurface.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/ISurfaceComposerClient.h> -#include <surfaceflinger/SurfaceComposerClient.h> - -#include <private/surfaceflinger/LayerState.h> -#include <private/surfaceflinger/SharedBufferStack.h> +#include <gui/ISurface.h> +#include <gui/ISurfaceComposer.h> +#include <gui/ISurfaceComposerClient.h> +#include <gui/SurfaceComposerClient.h> #include <private/gui/ComposerService.h> +#include <private/gui/LayerState.h> +#include <private/gui/SharedBufferStack.h> namespace android { // --------------------------------------------------------------------------- diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp index ee5deb3..e1fd700 100644 --- a/libs/gui/SurfaceTexture.cpp +++ b/libs/gui/SurfaceTexture.cpp @@ -25,15 +25,14 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#include <gui/SurfaceTexture.h> - #include <hardware/hardware.h> -#include <private/gui/ComposerService.h> +#include <gui/IGraphicBufferAlloc.h> +#include <gui/ISurfaceComposer.h> +#include <gui/SurfaceComposerClient.h> +#include <gui/SurfaceTexture.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/SurfaceComposerClient.h> -#include <surfaceflinger/IGraphicBufferAlloc.h> +#include <private/gui/ComposerService.h> #include <utils/Log.h> #include <utils/String8.h> diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index d0934ba..dac54a8 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -17,12 +17,12 @@ #define LOG_TAG "SurfaceTextureClient" //#define LOG_NDEBUG 0 -#include <gui/SurfaceTextureClient.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/SurfaceComposerClient.h> - #include <utils/Log.h> +#include <gui/ISurfaceComposer.h> +#include <gui/SurfaceComposerClient.h> +#include <gui/SurfaceTextureClient.h> + #include <private/gui/ComposerService.h> namespace android { diff --git a/libs/gui/tests/SurfaceTexture_test.cpp b/libs/gui/tests/SurfaceTexture_test.cpp index b18e7b0..8c6defe 100644 --- a/libs/gui/tests/SurfaceTexture_test.cpp +++ b/libs/gui/tests/SurfaceTexture_test.cpp @@ -24,9 +24,9 @@ #include <utils/String8.h> #include <utils/threads.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/Surface.h> -#include <surfaceflinger/SurfaceComposerClient.h> +#include <gui/ISurfaceComposer.h> +#include <gui/Surface.h> +#include <gui/SurfaceComposerClient.h> #include <EGL/egl.h> #include <EGL/eglext.h> diff --git a/libs/gui/tests/Surface_test.cpp b/libs/gui/tests/Surface_test.cpp index ea52750..b585d68 100644 --- a/libs/gui/tests/Surface_test.cpp +++ b/libs/gui/tests/Surface_test.cpp @@ -17,9 +17,9 @@ #include <gtest/gtest.h> #include <binder/IMemory.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/Surface.h> -#include <surfaceflinger/SurfaceComposerClient.h> +#include <gui/ISurfaceComposer.h> +#include <gui/Surface.h> +#include <gui/SurfaceComposerClient.h> #include <utils/String8.h> #include <private/gui/ComposerService.h> diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp index cea17f8..9baae80 100644 --- a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -31,8 +31,6 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <pixelflinger/pixelflinger.h> - #include "DisplayHardware/DisplayHardware.h" #include <hardware/gralloc.h> diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.h b/services/surfaceflinger/DisplayHardware/DisplayHardware.h index 02be4dc..0a828b3 100644 --- a/services/surfaceflinger/DisplayHardware/DisplayHardware.h +++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.h @@ -27,8 +27,6 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include <pixelflinger/pixelflinger.h> - #include "GLExtensions.h" #include "DisplayHardware/DisplayHardwareBase.h" diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index efcdd87..c15fdbc 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -17,6 +17,7 @@ #include <stdlib.h> #include <stdint.h> #include <sys/types.h> +#include <math.h> #include <cutils/compiler.h> #include <cutils/native_handle.h> @@ -29,7 +30,7 @@ #include <ui/GraphicBuffer.h> #include <ui/PixelFormat.h> -#include <surfaceflinger/Surface.h> +#include <gui/Surface.h> #include "clz.h" #include "DisplayHardware/DisplayHardware.h" @@ -38,7 +39,6 @@ #include "Layer.h" #include "SurfaceFlinger.h" #include "SurfaceTextureLayer.h" -#include <math.h> #define DEBUG_RESIZE 0 diff --git a/services/surfaceflinger/Layer.h b/services/surfaceflinger/Layer.h index 39bbb2b..8d508c2 100644 --- a/services/surfaceflinger/Layer.h +++ b/services/surfaceflinger/Layer.h @@ -22,10 +22,13 @@ #include <gui/SurfaceTexture.h> -#include <pixelflinger/pixelflinger.h> +#include <utils/Timers.h> + #include <ui/GraphicBuffer.h> #include <ui/PixelFormat.h> +#include <gui/ISurfaceComposerClient.h> + #include <EGL/egl.h> #include <EGL/eglext.h> #include <GLES/gl.h> @@ -34,7 +37,6 @@ #include "LayerBase.h" #include "SurfaceTextureLayer.h" #include "Transform.h" -#include <utils/Timers.h> namespace android { diff --git a/services/surfaceflinger/LayerBase.h b/services/surfaceflinger/LayerBase.h index b8f7680..cd6efdd 100644 --- a/services/surfaceflinger/LayerBase.h +++ b/services/surfaceflinger/LayerBase.h @@ -28,10 +28,9 @@ #include <ui/Region.h> -#include <surfaceflinger/ISurfaceComposerClient.h> -#include <private/surfaceflinger/LayerState.h> +#include <gui/ISurfaceComposerClient.h> -#include <pixelflinger/pixelflinger.h> +#include <private/gui/LayerState.h> #include <hardware/hwcomposer.h> diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 05b5bf5..62461bb 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -43,14 +43,13 @@ #include <ui/GraphicBufferAllocator.h> #include <ui/PixelFormat.h> -#include <pixelflinger/pixelflinger.h> #include <GLES/gl.h> #include "clz.h" +#include "DdmConnection.h" #include "DisplayEventConnection.h" #include "EventThread.h" #include "GLExtensions.h" -#include "DdmConnection.h" #include "Layer.h" #include "LayerDim.h" #include "LayerScreenshot.h" @@ -60,7 +59,7 @@ #include "DisplayHardware/HWComposer.h" #include <private/android_filesystem_config.h> -#include <private/surfaceflinger/SharedBufferStack.h> +#include <private/gui/SharedBufferStack.h> #define EGL_VERSION_HW_ANDROID 0x3143 diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h index fcd9361..b507877 100644 --- a/services/surfaceflinger/SurfaceFlinger.h +++ b/services/surfaceflinger/SurfaceFlinger.h @@ -33,9 +33,9 @@ #include <binder/IMemory.h> #include <ui/PixelFormat.h> -#include <surfaceflinger/IGraphicBufferAlloc.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/ISurfaceComposerClient.h> +#include <gui/IGraphicBufferAlloc.h> +#include <gui/ISurfaceComposer.h> +#include <gui/ISurfaceComposerClient.h> #include "Barrier.h" #include "Layer.h" diff --git a/services/surfaceflinger/tests/Transaction_test.cpp b/services/surfaceflinger/tests/Transaction_test.cpp index 396a3fd..84ae0d9 100644 --- a/services/surfaceflinger/tests/Transaction_test.cpp +++ b/services/surfaceflinger/tests/Transaction_test.cpp @@ -17,9 +17,12 @@ #include <gtest/gtest.h> #include <binder/IMemory.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/Surface.h> -#include <surfaceflinger/SurfaceComposerClient.h> + +#include <gui/ISurfaceComposer.h> +#include <gui/Surface.h> +#include <gui/SurfaceComposerClient.h> +#include <private/gui/ComposerService.h> + #include <utils/String8.h> namespace android { diff --git a/services/surfaceflinger/tests/resize/resize.cpp b/services/surfaceflinger/tests/resize/resize.cpp index 7f3f064..c143b3d 100644 --- a/services/surfaceflinger/tests/resize/resize.cpp +++ b/services/surfaceflinger/tests/resize/resize.cpp @@ -22,9 +22,8 @@ #include <binder/ProcessState.h> #include <binder/IServiceManager.h> -#include <surfaceflinger/Surface.h> -#include <surfaceflinger/ISurface.h> -#include <surfaceflinger/SurfaceComposerClient.h> +#include <gui/Surface.h> +#include <gui/SurfaceComposerClient.h> using namespace android; diff --git a/services/surfaceflinger/tests/screencap/screencap.cpp b/services/surfaceflinger/tests/screencap/screencap.cpp index 6cf1504..53566e0 100644 --- a/services/surfaceflinger/tests/screencap/screencap.cpp +++ b/services/surfaceflinger/tests/screencap/screencap.cpp @@ -21,7 +21,7 @@ #include <binder/IServiceManager.h> #include <binder/IMemory.h> -#include <surfaceflinger/ISurfaceComposer.h> +#include <gui/ISurfaceComposer.h> #include <SkImageEncoder.h> #include <SkBitmap.h> diff --git a/services/surfaceflinger/tests/surface/surface.cpp b/services/surfaceflinger/tests/surface/surface.cpp index 9c15f9b..a8878f7 100644 --- a/services/surfaceflinger/tests/surface/surface.cpp +++ b/services/surfaceflinger/tests/surface/surface.cpp @@ -22,9 +22,8 @@ #include <binder/ProcessState.h> #include <binder/IServiceManager.h> -#include <surfaceflinger/Surface.h> -#include <surfaceflinger/ISurface.h> -#include <surfaceflinger/SurfaceComposerClient.h> +#include <gui/Surface.h> +#include <gui/SurfaceComposerClient.h> using namespace android; |