diff options
| -rw-r--r-- | core/jni/android_view_InputDevice.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_view_KeyCharacterMap.cpp | 2 | ||||
| -rw-r--r-- | core/jni/include/android_runtime/AndroidRuntime.h | 2 | ||||
| -rw-r--r-- | media/jni/audioeffect/android_media_AudioEffect.cpp | 2 | ||||
| -rw-r--r-- | media/jni/audioeffect/android_media_Visualizer.cpp | 2 | ||||
| -rw-r--r-- | media/jni/soundpool/android_media_SoundPool.cpp | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/core/jni/android_view_InputDevice.cpp b/core/jni/android_view_InputDevice.cpp index 9cf6a9d08890..4e6e512b69df 100644 --- a/core/jni/android_view_InputDevice.cpp +++ b/core/jni/android_view_InputDevice.cpp @@ -17,7 +17,7 @@ #include <input/Input.h> #include <android_runtime/AndroidRuntime.h> -#include <nativehelper/jni.h> +#include <jni.h> #include <nativehelper/JNIHelp.h> #include <ScopedLocalRef.h> diff --git a/core/jni/android_view_KeyCharacterMap.cpp b/core/jni/android_view_KeyCharacterMap.cpp index e5519a752c39..586b26ef328f 100644 --- a/core/jni/android_view_KeyCharacterMap.cpp +++ b/core/jni/android_view_KeyCharacterMap.cpp @@ -20,7 +20,7 @@ #include <input/Input.h> #include <binder/Parcel.h> -#include <nativehelper/jni.h> +#include <jni.h> #include <nativehelper/JNIHelp.h> #include "android_os_Parcel.h" diff --git a/core/jni/include/android_runtime/AndroidRuntime.h b/core/jni/include/android_runtime/AndroidRuntime.h index c2189d4af86d..3ec8b1fe903f 100644 --- a/core/jni/include/android_runtime/AndroidRuntime.h +++ b/core/jni/include/android_runtime/AndroidRuntime.h @@ -26,7 +26,7 @@ #include <utils/Vector.h> #include <utils/threads.h> #include <pthread.h> -#include <nativehelper/jni.h> +#include <jni.h> namespace android { diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index d4cc3fb8ab6e..1f93b34c9186 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -20,7 +20,7 @@ #define LOG_TAG "AudioEffects-JNI" #include <utils/Log.h> -#include <nativehelper/jni.h> +#include <jni.h> #include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include "media/AudioEffect.h" diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index 0645543d4a74..f0cfeef197d8 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -20,7 +20,7 @@ #define LOG_TAG "visualizers-JNI" #include <utils/Log.h> -#include <nativehelper/jni.h> +#include <jni.h> #include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/threads.h> diff --git a/media/jni/soundpool/android_media_SoundPool.cpp b/media/jni/soundpool/android_media_SoundPool.cpp index 9d0c1f84fada..f6706369f379 100644 --- a/media/jni/soundpool/android_media_SoundPool.cpp +++ b/media/jni/soundpool/android_media_SoundPool.cpp @@ -20,7 +20,7 @@ #define LOG_TAG "SoundPool-JNI" #include <utils/Log.h> -#include <nativehelper/jni.h> +#include <jni.h> #include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include "SoundPool.h" |