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 | 3cf613507f1e2f7bd932d921a6e222e426fd3be4 (patch) | |
| tree | 20c9dd57e2227046ab1d6fc1185f4136c6dac12e /include/private | |
| parent | 988e3f0b2c74095deae580157c57935a98573052 (diff) | |
| download | frameworks_av-3cf613507f1e2f7bd932d921a6e222e426fd3be4.zip frameworks_av-3cf613507f1e2f7bd932d921a6e222e426fd3be4.tar.gz frameworks_av-3cf613507f1e2f7bd932d921a6e222e426fd3be4.tar.bz2 | |
split libsurfaceflinger_client and libcamera_client out of libui
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/surfaceflinger/LayerState.h (renamed from include/private/ui/LayerState.h) | 9 | ||||
| -rw-r--r-- | include/private/surfaceflinger/SharedBufferStack.h (renamed from include/private/ui/SharedBufferStack.h) | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/include/private/ui/LayerState.h b/include/private/surfaceflinger/LayerState.h index f1a2618..d7fe572 100644 --- a/include/private/ui/LayerState.h +++ b/include/private/surfaceflinger/LayerState.h @@ -14,17 +14,18 @@ * limitations under the License. */ -#ifndef ANDROID_COMPOSER_LAYER_STATE_H -#define ANDROID_COMPOSER_LAYER_STATE_H +#ifndef ANDROID_SF_LAYER_STATE_H +#define ANDROID_SF_LAYER_STATE_H #include <stdint.h> #include <sys/types.h> #include <utils/Errors.h> -#include <ui/ISurfaceFlingerClient.h> #include <ui/Region.h> +#include <surfaceflinger/ISurface.h> + namespace android { class Parcel; @@ -69,5 +70,5 @@ struct layer_state_t { }; // namespace android -#endif // ANDROID_COMPOSER_LAYER_STATE_H +#endif // ANDROID_SF_LAYER_STATE_H diff --git a/include/private/ui/SharedBufferStack.h b/include/private/surfaceflinger/SharedBufferStack.h index bbc1822..9b5a1e0 100644 --- a/include/private/ui/SharedBufferStack.h +++ b/include/private/surfaceflinger/SharedBufferStack.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ANDROID_UI_SHARED_BUFFER_STACK_H -#define ANDROID_UI_SHARED_BUFFER_STACK_H +#ifndef ANDROID_SF_SHARED_BUFFER_STACK_H +#define ANDROID_SF_SHARED_BUFFER_STACK_H #include <stdint.h> #include <sys/types.h> @@ -356,4 +356,4 @@ COMPILE_TIME_ASSERT(sizeof(surface_flinger_cblk_t) <= 4096) // --------------------------------------------------------------------------- }; // namespace android -#endif /* ANDROID_UI_SHARED_BUFFER_STACK_H */ +#endif /* ANDROID_SF_SHARED_BUFFER_STACK_H */ |