From f91ca58ec4823d07b8cf587bd97a9866c2990b7f Mon Sep 17 00:00:00 2001
From: Steven Moreland <smoreland@google.com>
Date: Tue, 1 Aug 2017 10:18:40 -0700
Subject: [PATCH] com.android.server: 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: com.android.server finds headers
Bug: 63762847
Merged-In: Icb3018f520004f65e8dd565d6e1d563551548eba
Change-Id: Ib36fec53c30760af5dac4097b3eceda6c4c6c7f0
---
 cmds/hid/jni/com_android_commands_hid_Device.cpp              | 4 ++--
 services/core/jni/com_android_server_ConsumerIrService.cpp    | 4 ++--
 .../jni/com_android_server_location_GnssLocationProvider.cpp  | 2 +-
 .../core/jni/com_android_server_power_PowerManagerService.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmds/hid/jni/com_android_commands_hid_Device.cpp b/cmds/hid/jni/com_android_commands_hid_Device.cpp
index 1ea33ced7bbfa..f9458a7e89fde 100644
--- a/cmds/hid/jni/com_android_commands_hid_Device.cpp
+++ b/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>
diff --git a/services/core/jni/com_android_server_ConsumerIrService.cpp b/services/core/jni/com_android_server_ConsumerIrService.cpp
index 7104870349b5b..4bad9dd430585 100644
--- a/services/core/jni/com_android_server_ConsumerIrService.cpp
+++ b/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 {
 
diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
index 25e819c2c1dcb..b09cba6a6a8fb 100644
--- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp
+++ b/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"
diff --git a/services/core/jni/com_android_server_power_PowerManagerService.cpp b/services/core/jni/com_android_server_power_PowerManagerService.cpp
index 4bd7b63f8a27c..2593f12567b8f 100644
--- a/services/core/jni/com_android_server_power_PowerManagerService.cpp
+++ b/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>