Merge "com.android.server: use proper nativehelper headers"

cmds/hid/jni/com_android_commands_hid_Device.cpp

@@ -31,8 +31,8 @@
 #include <android_os_MessageQueue.h>
 #include <core_jni_helpers.h>
 #include <jni.h>
-#include <JNIHelp.h>
-#include <ScopedPrimitiveArray.h>
+#include <nativehelper/JNIHelp.h>
+#include <nativehelper/ScopedPrimitiveArray.h>
 #include <ScopedUtfChars.h>
 #include <utils/Log.h>
 #include <utils/Looper.h>

services/core/jni/com_android_server_ConsumerIrService.cpp

@@ -17,7 +17,7 @@
 #define LOG_TAG "ConsumerIrService"
 
 #include "jni.h"
-#include "JNIHelp.h"
+#include <nativehelper/JNIHelp.h>
 #include "android_runtime/AndroidRuntime.h"
 
 #include <stdlib.h>
@@ -25,7 +25,7 @@
 #include <utils/Log.h>
 #include <hardware/hardware.h>
 #include <hardware/consumerir.h>
-#include <ScopedPrimitiveArray.h>
+#include <nativehelper/ScopedPrimitiveArray.h>
 
 namespace android {
 

services/core/jni/com_android_server_location_GnssLocationProvider.cpp

@@ -18,7 +18,7 @@
 
 #define LOG_NDEBUG 0
 
-#include "JNIHelp.h"
+#include <nativehelper/JNIHelp.h>
 #include "jni.h"
 #include "hardware/hardware.h"
 #include "hardware/gps_internal.h"

services/core/jni/com_android_server_power_PowerManagerService.cpp

@@ -21,7 +21,7 @@
 #include "JNIHelp.h"
 #include "jni.h"
 
-#include <ScopedUtfChars.h>
+#include <nativehelper/ScopedUtfChars.h>
 
 #include <limits.h>