diff options
| author | Tyler Luu <tluu@ti.com> | 2012-07-31 17:16:00 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-10-10 18:55:47 +0300 |
| commit | b3c49e43a718df1b1b5e4dc104eb8a9d90981f03 (patch) | |
| tree | 15de250c7fc121b0ac8861359191a4d8f7faf53a /test | |
| parent | 7e43f6bc2fd3307b264056215eff9a4e3d65ab39 (diff) | |
| download | hardware_ti_omap4-b3c49e43a718df1b1b5e4dc104eb8a9d90981f03.zip hardware_ti_omap4-b3c49e43a718df1b1b5e4dc104eb8a9d90981f03.tar.gz hardware_ti_omap4-b3c49e43a718df1b1b5e4dc104eb8a9d90981f03.tar.bz2 | |
surfacetexture_test: Fix build for JB
Fix include files for surfacetexture_test.
Change-Id: Id0d3ec7eafe9fc1bcebf3b4b35477e7b25aeba01
Signed-off-by: Tyler Luu <tluu@ti.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/CameraHal/surfacetexture_test.cpp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/test/CameraHal/surfacetexture_test.cpp b/test/CameraHal/surfacetexture_test.cpp index c8d0914..b25853e 100644 --- a/test/CameraHal/surfacetexture_test.cpp +++ b/test/CameraHal/surfacetexture_test.cpp @@ -41,12 +41,6 @@ #include <string.h> #include <climits> -#include <surfaceflinger/Surface.h> -#include <surfaceflinger/ISurface.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/ISurfaceComposerClient.h> -#include <surfaceflinger/SurfaceComposerClient.h> - #include <gui/SurfaceTexture.h> #include <gui/SurfaceTextureClient.h> #include <ui/GraphicBuffer.h> @@ -71,9 +65,24 @@ #include <sys/wait.h> -#include "ion.h" #include <sys/mman.h> +#ifdef ANDROID_API_JB_OR_LATER +#include <gui/Surface.h> +#include <gui/ISurface.h> +#include <gui/ISurfaceComposer.h> +#include <gui/ISurfaceComposerClient.h> +#include <gui/SurfaceComposerClient.h> +#include <ion/ion.h> +#else +#include <surfaceflinger/Surface.h> +#include <surfaceflinger/ISurface.h> +#include <surfaceflinger/ISurfaceComposer.h> +#include <surfaceflinger/ISurfaceComposerClient.h> +#include <surfaceflinger/SurfaceComposerClient.h> +#include "ion.h" +#endif + #include "camera_test.h" #define ASSERT(X) \ @@ -102,7 +111,7 @@ using namespace android; static void test_format (int format, int page_mode, int width, int height) { - SurfaceTexture *st; + sp<SurfaceTexture> st; SurfaceTextureClient *stc; GLint tex_id = 0; sp<ANativeWindow> anw; @@ -159,7 +168,7 @@ test_format (int format, int page_mode, int width, int height) } //delete stc; - delete st; + st.clear(); } void |