Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9882d6da authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "Reference nativehelper/jni.h as jni.h" am: 899a1f23 am: d2bf323c 

am: 238be4a6

Change-Id: Icb75bc6c2ba9750349de0e4f0ea15c29b5502b7b
parents 11e0e337 238be4a6

core/jni/android_view_InputDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

core/jni/android_view_KeyCharacterMap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"

core/jni/include/android_runtime/AndroidRuntime.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <utils/Vector.h>

#include <utils/threads.h>

#include <pthread.h>

#include <nativehelper/jni.h>

#include <jni.h>





namespace android {

media/jni/audioeffect/android_media_AudioEffect.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"

media/jni/audioeffect/android_media_Visualizer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>