Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reference nativehelper/jni.h as jni.h"

Browse Source 
am: 899a1f23c5

Change-Id: I30ec4f6b329360ea4161f2ad5538ecd238db7b62
This commit is contained in:
Steven Moreland
2017-07-18 20:05:36 +00:00
committed by android-build-merger
parent 253e515259 899a1f23c5
commit d2bf323c40
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_view_InputDevice.cpp
View File

@@ -17,7 +17,7 @@
#include <input/Input.h> #include <input/Input.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include <nativehelper/jni.h> #include <jni.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <ScopedLocalRef.h> #include <ScopedLocalRef.h>

2
core/jni/android_view_KeyCharacterMap.cpp
View File

@@ -20,7 +20,7 @@
#include <input/Input.h> #include <input/Input.h>
#include <binder/Parcel.h> #include <binder/Parcel.h>
#include <nativehelper/jni.h> #include <jni.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include "android_os_Parcel.h" #include "android_os_Parcel.h"

2
core/jni/include/android_runtime/AndroidRuntime.h
View File

@@ -26,7 +26,7 @@
#include <utils/Vector.h> #include <utils/Vector.h>
#include <utils/threads.h> #include <utils/threads.h>
#include <pthread.h> #include <pthread.h>
#include <nativehelper/jni.h> #include <jni.h>
namespace android { namespace android {

2
media/jni/audioeffect/android_media_AudioEffect.cpp
View File

@@ -20,7 +20,7 @@
#define LOG_TAG "AudioEffects-JNI" #define LOG_TAG "AudioEffects-JNI"
#include <utils/Log.h> #include <utils/Log.h>
#include <nativehelper/jni.h> #include <jni.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include "media/AudioEffect.h" #include "media/AudioEffect.h"

2
media/jni/audioeffect/android_media_Visualizer.cpp
View File

@@ -20,7 +20,7 @@
#define LOG_TAG "visualizers-JNI" #define LOG_TAG "visualizers-JNI"
#include <utils/Log.h> #include <utils/Log.h>
#include <nativehelper/jni.h> #include <jni.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include <utils/threads.h> #include <utils/threads.h>

2
media/jni/soundpool/android_media_SoundPool.cpp
View File

@@ -20,7 +20,7 @@
#define LOG_TAG "SoundPool-JNI" #define LOG_TAG "SoundPool-JNI"
#include <utils/Log.h> #include <utils/Log.h>
#include <nativehelper/jni.h> #include <jni.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>
#include "SoundPool.h" #include "SoundPool.h"