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 | 8335f1ccccedb6655d96d9d5b697a7f0938235dd (patch) | |
| tree | 30a7f8b3e646157365dd51222665a68753fa25e3 /services/camera | |
| parent | 57235fc65b5920f4867e66c8263efab49e92a21b (diff) | |
| download | frameworks_base-8335f1ccccedb6655d96d9d5b697a7f0938235dd.zip frameworks_base-8335f1ccccedb6655d96d9d5b697a7f0938235dd.tar.gz frameworks_base-8335f1ccccedb6655d96d9d5b697a7f0938235dd.tar.bz2 | |
fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
Diffstat (limited to 'services/camera')
3 files changed, 1 insertions, 3 deletions
diff --git a/services/camera/libcameraservice/CameraHardwareInterface.h b/services/camera/libcameraservice/CameraHardwareInterface.h index 78e225f..87a0802 100644 --- a/services/camera/libcameraservice/CameraHardwareInterface.h +++ b/services/camera/libcameraservice/CameraHardwareInterface.h @@ -21,7 +21,6 @@ #include <binder/MemoryBase.h> #include <binder/MemoryHeapBase.h> #include <utils/RefBase.h> -#include <surfaceflinger/ISurface.h> #include <ui/GraphicBuffer.h> #include <camera/Camera.h> #include <camera/CameraParameters.h> diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 06fc708..adf1d49 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -29,10 +29,10 @@ #include <cutils/atomic.h> #include <cutils/properties.h> #include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include <hardware/hardware.h> #include <media/AudioSystem.h> #include <media/mediaplayer.h> -#include <surfaceflinger/ISurface.h> #include <utils/Errors.h> #include <utils/Log.h> #include <utils/String16.h> diff --git a/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp b/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp index 1055538..e417b79 100644 --- a/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp +++ b/services/camera/tests/CameraServiceTest/CameraServiceTest.cpp @@ -22,7 +22,6 @@ #include <sys/types.h> #include <sys/wait.h> #include <unistd.h> -#include <surfaceflinger/ISurface.h> #include <camera/Camera.h> #include <camera/CameraParameters.h> #include <ui/GraphicBuffer.h> |