fix libgui header location

Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
2012-02-25 18:48:35 -08:00 · 2012-02-25 18:48:35 -08:00 · 90ac799241
parent f91bb05132
commit 90ac799241
33 changed files with 91 additions and 102 deletions
--- 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>
--- a/include/surfaceflinger/IGraphicBufferAlloc.h
+++ b/include/surfaceflinger/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
--- a/include/surfaceflinger/ISurface.h
+++ b/include/surfaceflinger/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
--- a/include/surfaceflinger/ISurfaceComposer.h
+++ b/include/surfaceflinger/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
--- a/include/surfaceflinger/ISurfaceComposerClient.h
+++ b/include/surfaceflinger/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
--- a/include/surfaceflinger/Surface.h
+++ b/include/surfaceflinger/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
--- a/include/surfaceflinger/SurfaceComposerClient.h
+++ b/include/surfaceflinger/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
--- a/include/private/surfaceflinger/LayerState.h
+++ b/include/private/surfaceflinger/LayerState.h
@ -23,8 +23,7 @@
 #include <utils/Errors.h>

 #include <ui/Region.h>
-
-#include <surfaceflinger/ISurface.h>
+#include <gui/ISurface.h>

 namespace android {

--- a/include/private/surfaceflinger/SharedBufferStack.h
+++ b/include/private/surfaceflinger/SharedBufferStack.h
--- 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>
--- 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 {
--- 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>

 // ---------------------------------------------------------------------------

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

--- a/libs/gui/ISurfaceComposer.cpp
+++ b/libs/gui/ISurfaceComposer.cpp
@ -25,17 +25,15 @@
 #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 <private/gui/LayerState.h>

 #include <ui/DisplayInfo.h>

-#include <gui/ISurfaceTexture.h>
-
 #include <utils/Log.h>

 // ---------------------------------------------------------------------------
--- 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>

 // ---------------------------------------------------------------------------

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

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

--- 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 {
 // ---------------------------------------------------------------------------
--- 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>
--- 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 {
--- 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>
--- 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>
--- 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>
--- 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"
--- 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

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

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

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

--- 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"
--- 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 {
--- 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;

--- 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>
--- 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;