diff options
| author | Mathias Agopian <mathias@google.com> | 2012-02-25 18:48:35 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-02-27 13:03:08 -0800 |
| commit | df712ea86e6350f7005a02ab0e1c60c28a343ed0 (patch) | |
| tree | 75401d5ef563d1ae76aaae4965f65bb39f92736c /include | |
| parent | d3393c35259588e8ad61a43d1d1aa1568e943307 (diff) | |
| download | frameworks_av-df712ea86e6350f7005a02ab0e1c60c28a343ed0.zip frameworks_av-df712ea86e6350f7005a02ab0e1c60c28a343ed0.tar.gz frameworks_av-df712ea86e6350f7005a02ab0e1c60c28a343ed0.tar.bz2 | |
fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/ICamera.h | 4 | ||||
| -rw-r--r-- | include/private/gui/LayerState.h (renamed from include/private/surfaceflinger/LayerState.h) | 3 | ||||
| -rw-r--r-- | include/private/gui/SharedBufferStack.h (renamed from include/private/surfaceflinger/SharedBufferStack.h) | 0 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/camera/ICamera.h b/include/camera/ICamera.h index 400d7f4..3d18837 100644 --- a/include/camera/ICamera.h +++ b/include/camera/ICamera.h @@ -20,15 +20,15 @@ #include <utils/RefBase.h> #include <binder/IInterface.h> #include <binder/Parcel.h> -#include <surfaceflinger/Surface.h> #include <binder/IMemory.h> #include <utils/String8.h> #include <camera/Camera.h> -#include <gui/ISurfaceTexture.h> namespace android { class ICameraClient; +class ISurfaceTexture; +class Surface; class ICamera: public IInterface { 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 |