diff options
| author | Steven Moreland <smoreland@google.com> | 2017-07-31 19:08:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-31 19:08:25 +0000 |
| commit | 47f9580aaa2fa09bc387c04a54dd28da637deeac (patch) | |
| tree | ac1b932ea6f87b41b2e13a84c8417cfd6eda6e16 | |
| parent | 78a7feeb2601037bba61aec5f24302896dace6bc (diff) | |
| parent | 07e4fc6758c6c8053dafcbd1bbc03b163647081d (diff) | |
| download | voip-47f9580aaa2fa09bc387c04a54dd28da637deeac.tar.gz | |
Merge "frameworks/opt/net/voip: use proper nativehelper headers" am: eca3c26d49
am: 07e4fc6758
Change-Id: I91afdc5871c5ada287dbda5cef3391320bb88173
| -rw-r--r-- | src/jni/rtp/AudioGroup.cpp | 4 | ||||
| -rw-r--r-- | src/jni/rtp/RtpStream.cpp | 2 | ||||
| -rw-r--r-- | src/jni/rtp/util.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
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" 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); 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) { |