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 /core/jni | |
| 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 'core/jni')
| -rw-r--r-- | core/jni/Android.mk | 2 | ||||
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 4 | ||||
| -rw-r--r-- | core/jni/android_view_Display.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_view_Surface.cpp | 2 | ||||
| -rw-r--r-- | core/jni/com_google_android_gles_jni_EGLImpl.cpp | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 1ffd265..e8749ed 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -159,6 +159,8 @@ LOCAL_SHARED_LIBRARIES := \ libbinder \ libnetutils \ libui \ + libsurfaceflinger_client \ + libcamera_client \ libskiagl \ libskia \ libsqlite \ diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 03107a4..9c0e282 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -25,8 +25,8 @@ #include <utils/Vector.h> -#include <ui/Surface.h> -#include <ui/Camera.h> +#include <surfaceflinger/Surface.h> +#include <camera/Camera.h> #include <binder/IMemory.h> using namespace android; diff --git a/core/jni/android_view_Display.cpp b/core/jni/android_view_Display.cpp index bb7b5ef..2e160ae 100644 --- a/core/jni/android_view_Display.cpp +++ b/core/jni/android_view_Display.cpp @@ -17,7 +17,7 @@ #include <stdio.h> #include <assert.h> -#include <ui/SurfaceComposerClient.h> +#include <surfaceflinger/SurfaceComposerClient.h> #include <ui/PixelFormat.h> #include <ui/DisplayInfo.h> diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 40c8aa0..723205a 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -18,7 +18,7 @@ #include "android_util_Binder.h" -#include <ui/SurfaceComposerClient.h> +#include <surfaceflinger/SurfaceComposerClient.h> #include <ui/Region.h> #include <ui/Rect.h> diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index 974fc0b..6a8c4b9 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -21,7 +21,7 @@ #include <EGL/egl.h> #include <GLES/gl.h> -#include <ui/Surface.h> +#include <surfaceflinger/Surface.h> #include <SkBitmap.h> #include <SkPixelRef.h> |