diff options
author | Mathias Agopian <mathias@google.com> | 2009-05-19 19:08:10 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2009-05-20 12:55:03 -0700 |
commit | 0795272aa226f4e965968a03daddc53ce30b7cda (patch) | |
tree | 6b4e8ba5e57c5dcf2dd770c24e14c43eda42fdd7 /core | |
parent | 25ba5b6564224dceefa086b5c439ef28dad530ca (diff) | |
download | frameworks_base-0795272aa226f4e965968a03daddc53ce30b7cda.zip frameworks_base-0795272aa226f4e965968a03daddc53ce30b7cda.tar.gz frameworks_base-0795272aa226f4e965968a03daddc53ce30b7cda.tar.bz2 |
move libbinder's header files under includes/binder
Diffstat (limited to 'core')
-rw-r--r-- | core/jni/ActivityManager.cpp | 6 | ||||
-rw-r--r-- | core/jni/AndroidRuntime.cpp | 6 | ||||
-rw-r--r-- | core/jni/CursorWindow.cpp | 2 | ||||
-rw-r--r-- | core/jni/CursorWindow.h | 2 | ||||
-rw-r--r-- | core/jni/android/graphics/Bitmap.cpp | 2 | ||||
-rw-r--r-- | core/jni/android/graphics/Region.cpp | 2 | ||||
-rw-r--r-- | core/jni/android_hardware_Camera.cpp | 2 | ||||
-rw-r--r-- | core/jni/android_media_AudioTrack.cpp | 4 | ||||
-rw-r--r-- | core/jni/android_util_Binder.cpp | 10 | ||||
-rw-r--r-- | core/jni/android_util_Binder.h | 2 | ||||
-rw-r--r-- | core/jni/android_util_Process.cpp | 6 |
11 files changed, 22 insertions, 22 deletions
diff --git a/core/jni/ActivityManager.cpp b/core/jni/ActivityManager.cpp index 9017827..8950dfb 100644 --- a/core/jni/ActivityManager.cpp +++ b/core/jni/ActivityManager.cpp @@ -16,9 +16,9 @@ #include <unistd.h> #include <android_runtime/ActivityManager.h> -#include <utils/IBinder.h> -#include <utils/IServiceManager.h> -#include <utils/Parcel.h> +#include <binder/IBinder.h> +#include <binder/IServiceManager.h> +#include <binder/Parcel.h> #include <utils/String8.h> namespace android { diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 592263a..2bb1b38 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -19,11 +19,11 @@ //#define LOG_NDEBUG 0 #include <android_runtime/AndroidRuntime.h> -#include <utils/IBinder.h> -#include <utils/IServiceManager.h> +#include <binder/IBinder.h> +#include <binder/IServiceManager.h> #include <utils/Log.h> #include <utils/misc.h> -#include <utils/Parcel.h> +#include <binder/Parcel.h> #include <utils/string_array.h> #include <utils/threads.h> #include <cutils/properties.h> diff --git a/core/jni/CursorWindow.cpp b/core/jni/CursorWindow.cpp index fb891c9..7864189 100644 --- a/core/jni/CursorWindow.cpp +++ b/core/jni/CursorWindow.cpp @@ -18,7 +18,7 @@ #define LOG_TAG "CursorWindow" #include <utils/Log.h> -#include <utils/MemoryDealer.h> +#include <binder/MemoryDealer.h> #include <assert.h> #include <string.h> diff --git a/core/jni/CursorWindow.h b/core/jni/CursorWindow.h index 0fb074f..e98b009 100644 --- a/core/jni/CursorWindow.h +++ b/core/jni/CursorWindow.h @@ -21,7 +21,7 @@ #include <stddef.h> #include <stdint.h> -#include <utils/MemoryDealer.h> +#include <binder/MemoryDealer.h> #include <utils/RefBase.h> #include <jni.h> diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 65f44d5..29d8d3c 100644 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -5,7 +5,7 @@ #include "SkDither.h"
#include "SkUnPreMultiply.h"
-#include "Parcel.h"
+#include <binder/Parcel.h>
#include "android_util_Binder.h"
#include "android_nio_utils.h"
#include "CreateJavaOutputStreamAdaptor.h"
diff --git a/core/jni/android/graphics/Region.cpp b/core/jni/android/graphics/Region.cpp index 1dc0314..723cd37 100644 --- a/core/jni/android/graphics/Region.cpp +++ b/core/jni/android/graphics/Region.cpp @@ -134,7 +134,7 @@ static void Region_scale(JNIEnv* env, jobject region, jfloat scale, jobject dst) //////////////////////////////////////////////////////////////////////////////////////////////////////////// -#include "Parcel.h" +#include <binder/Parcel.h> #include "android_util_Binder.h" static SkRegion* Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel) diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index c107993..31086b8 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -25,7 +25,7 @@ #include <ui/Surface.h> #include <ui/Camera.h> -#include <utils/IMemory.h> +#include <binder/IMemory.h> using namespace android; diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 42ada54..0cce3a6 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -30,8 +30,8 @@ #include "media/AudioSystem.h" #include "media/AudioTrack.h" -#include <utils/MemoryHeapBase.h> -#include <utils/MemoryBase.h> +#include <binder/MemoryHeapBase.h> +#include <binder/MemoryBase.h> // ---------------------------------------------------------------------------- diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 7325432..f0885fd 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -25,12 +25,12 @@ #include <stdio.h> #include <utils/Atomic.h> -#include <utils/IInterface.h> -#include <utils/IPCThreadState.h> +#include <binder/IInterface.h> +#include <binder/IPCThreadState.h> #include <utils/Log.h> -#include <utils/Parcel.h> -#include <utils/ProcessState.h> -#include <utils/IServiceManager.h> +#include <binder/Parcel.h> +#include <binder/ProcessState.h> +#include <binder/IServiceManager.h> #include <android_runtime/AndroidRuntime.h> diff --git a/core/jni/android_util_Binder.h b/core/jni/android_util_Binder.h index 16d993d..495e76a 100644 --- a/core/jni/android_util_Binder.h +++ b/core/jni/android_util_Binder.h @@ -15,7 +15,7 @@ ** limitations under the License. */ -#include <utils/IBinder.h> +#include <binder/IBinder.h> #include "jni.h" diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index 95c38dc..e8bffa4 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -18,9 +18,9 @@ #define LOG_TAG "Process" #include <utils/Log.h> -#include <utils/IPCThreadState.h> -#include <utils/ProcessState.h> -#include <utils/IServiceManager.h> +#include <binder/IPCThreadState.h> +#include <binder/ProcessState.h> +#include <binder/IServiceManager.h> #include <utils/String8.h> #include <utils/Vector.h> |