commit 3f08c356fcee333c0f1af25bdf733831bd4be1d9
author Steven Moreland <smoreland@google.com> Mon Jul 31 19:27:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 31 19:27:09 2017 +0000
tree ac1b932ea6f87b41b2e13a84c8417cfd6eda6e16
parent 78a7feeb2601037bba61aec5f24302896dace6bc
parent 7e2aff9fdb02d4b90203bb0456defd93a0b39e8c

Merge "frameworks/opt/net/voip: use proper nativehelper headers" am: eca3c26d49 am: 07e4fc6758 am: 47f9580aaa
am: 7e2aff9fdb

Change-Id: I65d7e44ddac0e4cfe79f82389b40b19370ccfaac

src/jni/rtp/AudioGroup.cpp

diff --git a/src/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp
index bad584b..a3f62b8 100644
--- a/src/jni/rtp/AudioGroup.cpp
+++ b/src/jni/rtp/AudioGroup.cpp
@@ -45,10 +45,10 @@
 #include <system/audio_effects/effect_aec.h>
 #include <system/audio.h>
 
-#include <ScopedUtfChars.h>
+#include <nativehelper/ScopedUtfChars.h>
 
 #include "jni.h"
-#include "JNIHelp.h"
+#include <nativehelper/JNIHelp.h>
 
 #include "AudioCodec.h"
 #include "EchoSuppressor.h"

src/jni/rtp/RtpStream.cpp

diff --git a/src/jni/rtp/RtpStream.cpp b/src/jni/rtp/RtpStream.cpp
index bfe8e24..4461e31 100644
--- a/src/jni/rtp/RtpStream.cpp
+++ b/src/jni/rtp/RtpStream.cpp
@@ -27,7 +27,7 @@
 #include <utils/Log.h>
 
 #include "jni.h"
-#include "JNIHelp.h"
+#include <nativehelper/JNIHelp.h>
 
 extern int parse(JNIEnv *env, jstring jAddress, int port, sockaddr_storage *ss);
 

src/jni/rtp/util.cpp

diff --git a/src/jni/rtp/util.cpp b/src/jni/rtp/util.cpp
index 1d702fc..6b94b7b 100644
--- a/src/jni/rtp/util.cpp
+++ b/src/jni/rtp/util.cpp
@@ -20,7 +20,7 @@
 #include <netinet/in.h>
 
 #include "jni.h"
-#include "JNIHelp.h"
+#include <nativehelper/JNIHelp.h>
 
 int parse(JNIEnv *env, jstring jAddress, int port, sockaddr_storage *ss)
 {