summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2017-08-10 18:08:37 -0700
committer Steven Moreland <smoreland@google.com> 2017-08-10 18:08:37 -0700
commitc195af9d0cf7de668e6b565ca5b43f433d6868c5 (patch)
treeb72c8b17f7a4df7a2cd8f0f69fafb73dadb1082e
parent4263a5ed5882ec0837578b35e149bedd45efe77c (diff)
ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were available before incorrectly as global headers in order to give access to jni.h. Test: modules using ScopedUtfChars find headers Bug: 63762847 Merged-In: I5e9f2b56f569b83ece0d854f7066655e1d64cc65 Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
-rw-r--r--cmds/hid/jni/com_android_commands_hid_Device.cpp2
-rw-r--r--media/jni/android_media_MediaRecorder.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmds/hid/jni/com_android_commands_hid_Device.cpp b/cmds/hid/jni/com_android_commands_hid_Device.cpp
index f9458a7e89fd..59953b89ba5f 100644
--- 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>
diff --git a/media/jni/android_media_MediaRecorder.cpp b/media/jni/android_media_MediaRecorder.cpp
index 922ad79e3d28..9da83c776572 100644
--- 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"