Merge "ScopedUtfChars: use proper nativehelper headers"

2017-08-11 20:40:35 +00:00
parent 21e4dbb6ed c195af9d0c
commit 75c9e4d594
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
@@ -33,7 +33,7 @@
 #include <jni.h>
 #include <nativehelper/JNIHelp.h>
 #include <nativehelper/ScopedPrimitiveArray.h>
-#include <ScopedUtfChars.h>
+#include <nativehelper/ScopedUtfChars.h>
 #include <utils/Log.h>
 #include <utils/Looper.h>
 #include <utils/StrongPointer.h>
--- a/media/jni/android_media_MediaRecorder.cpp
+++ b/media/jni/android_media_MediaRecorder.cpp
@@ -31,7 +31,7 @@
 #include <media/stagefright/PersistentSurface.h>
 #include <utils/threads.h>

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

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