Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp

2017-08-11 00:40:18 +00:00
parent f4f815c2cb 65e2ca2808
commit 1e8d712b78
2 changed files with 2 additions and 2 deletions
--- a/cmds/hid/jni/com_android_commands_hid_Device.cpp
+++ b/cmds/hid/jni/com_android_commands_hid_Device.cpp
@@ -29,7 +29,7 @@
 #include <jni.h>
 #include <nativehelper/JNIHelp.h>
 #include <nativehelper/ScopedPrimitiveArray.h>
-#include <ScopedUtfChars.h>
+#include <nativehelper/ScopedUtfChars.h>
 #include <android/looper.h>
 #include <android/log.h>

--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -32,7 +32,7 @@
 #include <media/stagefright/PersistentSurface.h>
 #include <utils/threads.h>

-#include <ScopedUtfChars.h>
+#include <nativehelper/ScopedUtfChars.h>

 #include "jni.h"
 #include "JNIHelp.h"