diff options
| author | Mathias Agopian <mathias@google.com> | 2010-02-09 17:46:37 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2010-02-11 13:16:22 -0800 |
| commit | 000479f9e325b4e426a67033abd92d47da412725 (patch) | |
| tree | 16b93ea777744aa24ffe7d3a191bb90529ad4ce5 /cmds/bootanimation | |
| parent | 28a5dc229ed25c771cde25668928edc788073029 (diff) | |
| download | frameworks_base-000479f9e325b4e426a67033abd92d47da412725.zip frameworks_base-000479f9e325b4e426a67033abd92d47da412725.tar.gz frameworks_base-000479f9e325b4e426a67033abd92d47da412725.tar.bz2 | |
split libsurfaceflinger_client and libcamera_client out of libui
Diffstat (limited to 'cmds/bootanimation')
| -rw-r--r-- | cmds/bootanimation/Android.mk | 3 | ||||
| -rw-r--r-- | cmds/bootanimation/BootAnimation.cpp | 5 | ||||
| -rw-r--r-- | cmds/bootanimation/BootAnimation.h | 4 | ||||
| -rw-r--r-- | cmds/bootanimation/bootanimation_main.cpp | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk index 939b63f..2b89759 100644 --- a/cmds/bootanimation/Android.mk +++ b/cmds/bootanimation/Android.mk @@ -21,7 +21,8 @@ LOCAL_SHARED_LIBRARIES := \ libui \ libskia \ libEGL \ - libGLESv1_CM + libGLESv1_CM \ + libsurfaceflinger_client LOCAL_C_INCLUDES := \ $(call include-path-for, corecg graphics) diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp index ce36c4b..ac2eb0d 100644 --- a/cmds/bootanimation/BootAnimation.cpp +++ b/cmds/bootanimation/BootAnimation.cpp @@ -34,11 +34,12 @@ #include <ui/Rect.h> #include <ui/Region.h> #include <ui/DisplayInfo.h> -#include <ui/ISurfaceComposer.h> -#include <ui/ISurfaceFlingerClient.h> #include <ui/FramebufferNativeWindow.h> #include <ui/EGLUtils.h> +#include <surfaceflinger/ISurfaceComposer.h> +#include <surfaceflinger/ISurfaceFlingerClient.h> + #include <core/SkBitmap.h> #include <images/SkImageDecoder.h> diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h index e53ba8b..8e28bba 100644 --- a/cmds/bootanimation/BootAnimation.h +++ b/cmds/bootanimation/BootAnimation.h @@ -23,8 +23,8 @@ #include <utils/threads.h> #include <utils/AssetManager.h> -#include <ui/ISurfaceComposer.h> -#include <ui/SurfaceComposerClient.h> +#include <surfaceflinger/ISurfaceComposer.h> +#include <surfaceflinger/SurfaceComposerClient.h> #include <EGL/egl.h> #include <GLES/gl.h> diff --git a/cmds/bootanimation/bootanimation_main.cpp b/cmds/bootanimation/bootanimation_main.cpp index 3c82fe5..5f8b744 100644 --- a/cmds/bootanimation/bootanimation_main.cpp +++ b/cmds/bootanimation/bootanimation_main.cpp @@ -25,7 +25,7 @@ #include <utils/Log.h> #include <utils/threads.h> -#include <ui/ISurfaceComposer.h> +#include <surfaceflinger/ISurfaceComposer.h> #if defined(HAVE_PTHREADS) # include <pthread.h> |