| commit | 342d98554de86ed62580bd142dd4ab70c9cb764e | [log] [tgz] |
|---|---|---|
| author | Orion Hodson <oth@google.com> | Sun Jan 27 17:14:15 2019 +0000 |
| committer | Orion Hodson <oth@google.com> | Sun Jan 27 17:16:30 2019 +0000 |
| tree | c79d9ae418102269d979377f2310b12758460ab1 | |
| parent | 8d1e0c5b73c03d6d2e1d00c1ad3126b9b92d6cd6 [diff] |
Use the correct headers for header_only_library dependencies on libnativehelper. Bug: 119840313 Test: m -j100 Change-Id: I9d9afeb8713cc8daca486c6f96fff09f6f8a473e
diff --git a/media/libmediaplayer2/JMedia2HTTPConnection.cpp b/media/libmediaplayer2/JMedia2HTTPConnection.cpp index d264a7f..e1baa10 100644 --- a/media/libmediaplayer2/JMedia2HTTPConnection.cpp +++ b/media/libmediaplayer2/JMedia2HTTPConnection.cpp
@@ -21,11 +21,10 @@ #include <mediaplayer2/JavaVMHelper.h> #include <mediaplayer2/JMedia2HTTPConnection.h> #include <media/stagefright/foundation/ADebug.h> -#include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/scoped_local_ref.h> #include "log/log.h" #include "jni.h" -#include <nativehelper/JNIHelp.h> namespace android {
diff --git a/media/libmediaplayer2/JMedia2HTTPService.cpp b/media/libmediaplayer2/JMedia2HTTPService.cpp index 264c15d..20e3573 100644 --- a/media/libmediaplayer2/JMedia2HTTPService.cpp +++ b/media/libmediaplayer2/JMedia2HTTPService.cpp
@@ -25,8 +25,7 @@ #include <mediaplayer2/JMedia2HTTPConnection.h> #include <media/stagefright/foundation/ADebug.h> -#include <nativehelper/JNIHelp.h> -#include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/scoped_local_ref.h> namespace android {
diff --git a/media/libmediaplayer2/nuplayer2/JMediaPlayer2Utils.cpp b/media/libmediaplayer2/nuplayer2/JMediaPlayer2Utils.cpp index bbd22bc..89703de 100644 --- a/media/libmediaplayer2/nuplayer2/JMediaPlayer2Utils.cpp +++ b/media/libmediaplayer2/nuplayer2/JMediaPlayer2Utils.cpp
@@ -22,7 +22,6 @@ #include <media/stagefright/MediaDefs.h> #include <media/stagefright/Utils.h> -#include <nativehelper/JNIHelp.h> #include <utils/Log.h> #include "log/log.h"