diff options
| author | Steven Moreland <smoreland@google.com> | 2017-07-20 02:50:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-20 02:50:53 +0000 |
| commit | 5c091dc9449b583e18656a8850a61f557dfcc945 (patch) | |
| tree | db4ca724dd661b112d2bd72da67f2a91edce0850 | |
| parent | 5f047a68d96f252772144a729f423c172ce816e4 (diff) | |
| parent | 826eafd95885adbfc142f3f70ec82b4091abed85 (diff) | |
Merge "frameworks/base: use proper nativehelper headers"
am: 826eafd958
Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
164 files changed, 219 insertions, 219 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index a1a00e5fb1b7..3fce90e410b0 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -32,8 +32,8 @@ #include <SkGraphics.h> #include "jni.h" -#include "JNIHelp.h" -#include "JniInvocation.h" +#include <nativehelper/JNIHelp.h> +#include <nativehelper/JniInvocation.h> #include "android_util_Binder.h" #include <stdio.h> diff --git a/core/jni/android/graphics/BitmapFactory.cpp b/core/jni/android/graphics/BitmapFactory.cpp index e714671027d6..c5bd7a51b30b 100644 --- a/core/jni/android/graphics/BitmapFactory.cpp +++ b/core/jni/android/graphics/BitmapFactory.cpp @@ -14,7 +14,7 @@ #include "Utils.h" #include "core_jni_helpers.h" -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <androidfw/Asset.h> #include <androidfw/ResourceTypes.h> #include <cutils/compiler.h> diff --git a/core/jni/android/graphics/BitmapRegionDecoder.cpp b/core/jni/android/graphics/BitmapRegionDecoder.cpp index 9355cfcdb0d3..3b081eff110a 100644 --- a/core/jni/android/graphics/BitmapRegionDecoder.cpp +++ b/core/jni/android/graphics/BitmapRegionDecoder.cpp @@ -33,7 +33,7 @@ #include "android_util_Binder.h" #include "core_jni_helpers.h" -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <androidfw/Asset.h> #include <binder/Parcel.h> #include <jni.h> diff --git a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp index 067489a547c0..0e907c349161 100644 --- a/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp +++ b/core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp @@ -5,7 +5,7 @@ #include "SkTypes.h" #include "Utils.h" -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <memory> static jmethodID gInputStream_readMethodID; diff --git a/core/jni/android/graphics/FontFamily.cpp b/core/jni/android/graphics/FontFamily.cpp index 9ad57b1a7d85..4cf2b562b9ee 100644 --- a/core/jni/android/graphics/FontFamily.cpp +++ b/core/jni/android/graphics/FontFamily.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "Minikin" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <core_jni_helpers.h> #include "SkData.h" @@ -24,8 +24,8 @@ #include "SkRefCnt.h" #include "SkTypeface.h" #include "GraphicsJNI.h" -#include <ScopedPrimitiveArray.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedPrimitiveArray.h> +#include <nativehelper/ScopedUtfChars.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_util_AssetManager.h> #include <androidfw/AssetManager.h> diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp index b11fd4fce714..f581e20c7816 100644 --- a/core/jni/android/graphics/Graphics.cpp +++ b/core/jni/android/graphics/Graphics.cpp @@ -4,7 +4,7 @@ #include <sys/mman.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "GraphicsJNI.h" #include "core_jni_helpers.h" diff --git a/core/jni/android/graphics/Movie.cpp b/core/jni/android/graphics/Movie.cpp index 776ed66f631a..b243817803ad 100644 --- a/core/jni/android/graphics/Movie.cpp +++ b/core/jni/android/graphics/Movie.cpp @@ -1,6 +1,6 @@ #include "CreateJavaOutputStreamAdaptor.h" #include "GraphicsJNI.h" -#include "ScopedLocalRef.h" +#include <nativehelper/ScopedLocalRef.h> #include "SkFrontBufferedStream.h" #include "Movie.h" #include "SkStream.h" diff --git a/core/jni/android/graphics/NinePatch.cpp b/core/jni/android/graphics/NinePatch.cpp index 91e5cafce06e..05734fd48c43 100644 --- a/core/jni/android/graphics/NinePatch.cpp +++ b/core/jni/android/graphics/NinePatch.cpp @@ -31,7 +31,7 @@ #include "GraphicsJNI.h" #include "NinePatchUtils.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" using namespace android; diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index fa25a8f0c596..5a24b9d67861 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -22,8 +22,8 @@ #include "jni.h" #include "GraphicsJNI.h" #include "core_jni_helpers.h" -#include <ScopedStringChars.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedStringChars.h> +#include <nativehelper/ScopedUtfChars.h> #include "SkBlurDrawLooper.h" #include "SkColorFilter.h" diff --git a/core/jni/android/graphics/Typeface.cpp b/core/jni/android/graphics/Typeface.cpp index eb2ca5dab516..e4540c0a1733 100644 --- a/core/jni/android/graphics/Typeface.cpp +++ b/core/jni/android/graphics/Typeface.cpp @@ -19,7 +19,7 @@ #include "FontUtils.h" #include "GraphicsJNI.h" -#include "ScopedPrimitiveArray.h" +#include <nativehelper/ScopedPrimitiveArray.h> #include "SkTypeface.h" #include <android_runtime/android_util_AssetManager.h> #include <androidfw/AssetManager.h> diff --git a/core/jni/android/graphics/pdf/PdfEditor.cpp b/core/jni/android/graphics/pdf/PdfEditor.cpp index c727519786d5..e75712c49fd3 100644 --- a/core/jni/android/graphics/pdf/PdfEditor.cpp +++ b/core/jni/android/graphics/pdf/PdfEditor.cpp @@ -26,7 +26,7 @@ #include "PdfUtils.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor" diff --git a/core/jni/android/graphics/pdf/PdfRenderer.cpp b/core/jni/android/graphics/pdf/PdfRenderer.cpp index 1001c05a891c..b5a4b2077f5f 100644 --- a/core/jni/android/graphics/pdf/PdfRenderer.cpp +++ b/core/jni/android/graphics/pdf/PdfRenderer.cpp @@ -17,7 +17,7 @@ #include "PdfUtils.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "GraphicsJNI.h" #include "SkBitmap.h" #include "SkMatrix.h" diff --git a/core/jni/android/opengl/util.cpp b/core/jni/android/opengl/util.cpp index 41d911150d93..825c19f557f1 100644 --- a/core/jni/android/opengl/util.cpp +++ b/core/jni/android/opengl/util.cpp @@ -15,7 +15,7 @@ */ #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "GraphicsJNI.h" #include <math.h> diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp index ee74ef002407..18f3177b95ae 100644 --- a/core/jni/android_app_NativeActivity.cpp +++ b/core/jni/android_app_NativeActivity.cpp @@ -35,7 +35,7 @@ #include <utils/Looper.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_os_MessageQueue.h" #include "android_view_InputChannel.h" #include "android_view_KeyEvent.h" @@ -45,7 +45,7 @@ #include "core_jni_helpers.h" -#include "ScopedUtfChars.h" +#include <nativehelper/ScopedUtfChars.h> #define LOG_TRACE(...) //#define LOG_TRACE(...) ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__) diff --git a/core/jni/android_app_admin_SecurityLog.cpp b/core/jni/android_app_admin_SecurityLog.cpp index e8ca79384f68..5c45b4b26a1b 100644 --- a/core/jni/android_app_admin_SecurityLog.cpp +++ b/core/jni/android_app_admin_SecurityLog.cpp @@ -16,7 +16,7 @@ #include <fcntl.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include "jni.h" #include <private/android_logger.h> diff --git a/core/jni/android_app_backup_FullBackup.cpp b/core/jni/android_app_backup_FullBackup.cpp index 63b2e2aaee12..3e399898ed55 100644 --- a/core/jni/android_app_backup_FullBackup.cpp +++ b/core/jni/android_app_backup_FullBackup.cpp @@ -20,7 +20,7 @@ #include <utils/Log.h> #include <utils/String8.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <androidfw/BackupHelpers.h> diff --git a/core/jni/android_backup_BackupDataInput.cpp b/core/jni/android_backup_BackupDataInput.cpp index 096a784b711b..aa8acc16bc3f 100644 --- a/core/jni/android_backup_BackupDataInput.cpp +++ b/core/jni/android_backup_BackupDataInput.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "FileBackupHelper_native" #include <utils/Log.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <androidfw/BackupHelpers.h> diff --git a/core/jni/android_backup_BackupDataOutput.cpp b/core/jni/android_backup_BackupDataOutput.cpp index a7894f487c55..4f5d1f80dffc 100644 --- a/core/jni/android_backup_BackupDataOutput.cpp +++ b/core/jni/android_backup_BackupDataOutput.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "FileBackupHelper_native" #include <utils/Log.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <androidfw/BackupHelpers.h> diff --git a/core/jni/android_backup_BackupHelperDispatcher.cpp b/core/jni/android_backup_BackupHelperDispatcher.cpp index 80bdaf84dca9..fac7eba4c0a2 100644 --- a/core/jni/android_backup_BackupHelperDispatcher.cpp +++ b/core/jni/android_backup_BackupHelperDispatcher.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "BackupHelperDispatcher_native" #include <utils/Log.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <sys/types.h> diff --git a/core/jni/android_backup_FileBackupHelperBase.cpp b/core/jni/android_backup_FileBackupHelperBase.cpp index 6d6ac1b47744..65840ee2c016 100644 --- a/core/jni/android_backup_FileBackupHelperBase.cpp +++ b/core/jni/android_backup_FileBackupHelperBase.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "FileBackupHelper_native" #include <utils/Log.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <androidfw/BackupHelpers.h> diff --git a/core/jni/android_content_res_ObbScanner.cpp b/core/jni/android_content_res_ObbScanner.cpp index 36d78cf3aca0..de429a07d0f6 100644 --- a/core/jni/android_content_res_ObbScanner.cpp +++ b/core/jni/android_content_res_ObbScanner.cpp @@ -21,7 +21,7 @@ #include <androidfw/ObbFile.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "utils/misc.h" #include "android_runtime/AndroidRuntime.h" diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp index f1fa76a1fc24..0d09b56a2935 100644 --- a/core/jni/android_database_CursorWindow.cpp +++ b/core/jni/android_database_CursorWindow.cpp @@ -20,7 +20,7 @@ #include <inttypes.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> diff --git a/core/jni/android_database_SQLiteCommon.h b/core/jni/android_database_SQLiteCommon.h index 0cac176502e2..81164ef1f99d 100644 --- a/core/jni/android_database_SQLiteCommon.h +++ b/core/jni/android_database_SQLiteCommon.h @@ -18,7 +18,7 @@ #define _ANDROID_DATABASE_SQLITE_COMMON_H #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <sqlite3.h> diff --git a/core/jni/android_database_SQLiteConnection.cpp b/core/jni/android_database_SQLiteConnection.cpp index bcc3bb09b69d..cbf09bd08673 100644 --- a/core/jni/android_database_SQLiteConnection.cpp +++ b/core/jni/android_database_SQLiteConnection.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "SQLiteConnection" #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/Log.h> diff --git a/core/jni/android_database_SQLiteDebug.cpp b/core/jni/android_database_SQLiteDebug.cpp index 4e4c36cbb7e1..3ba9b91028bb 100644 --- a/core/jni/android_database_SQLiteDebug.cpp +++ b/core/jni/android_database_SQLiteDebug.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "SQLiteDebug" #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <stdio.h> diff --git a/core/jni/android_database_SQLiteGlobal.cpp b/core/jni/android_database_SQLiteGlobal.cpp index 03e2387f24bc..ec5dc4ae30c5 100644 --- a/core/jni/android_database_SQLiteGlobal.cpp +++ b/core/jni/android_database_SQLiteGlobal.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "SQLiteGlobal" #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <sqlite3.h> diff --git a/core/jni/android_ddm_DdmHandleNativeHeap.cpp b/core/jni/android_ddm_DdmHandleNativeHeap.cpp index 3e7a04efc536..2f25d8f2d3a4 100644 --- a/core/jni/android_ddm_DdmHandleNativeHeap.cpp +++ b/core/jni/android_ddm_DdmHandleNativeHeap.cpp @@ -18,7 +18,7 @@ #undef LOG_TAG #define LOG_TAG "DdmHandleNativeHeap" -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <jni.h> #include "core_jni_helpers.h" diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index d606c2d6162e..d6f8dc45560c 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -20,7 +20,7 @@ #include <utils/Log.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <android_runtime/android_graphics_SurfaceTexture.h> #include <android_runtime/android_view_Surface.h> diff --git a/core/jni/android_hardware_SensorManager.cpp b/core/jni/android_hardware_SensorManager.cpp index f1b19e174436..60ac74c9d75b 100644 --- a/core/jni/android_hardware_SensorManager.cpp +++ b/core/jni/android_hardware_SensorManager.cpp @@ -15,13 +15,13 @@ */ #define LOG_TAG "SensorManager" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_os_MessageQueue.h" #include "core_jni_helpers.h" #include "jni.h" -#include <ScopedUtfChars.h> -#include <ScopedLocalRef.h> +#include <nativehelper/ScopedUtfChars.h> +#include <nativehelper/ScopedLocalRef.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_hardware_HardwareBuffer.h> #include <vndk/hardware_buffer.h> diff --git a/core/jni/android_hardware_SerialPort.cpp b/core/jni/android_hardware_SerialPort.cpp index 393dc7b9f4fd..190ddced7312 100644 --- a/core/jni/android_hardware_SerialPort.cpp +++ b/core/jni/android_hardware_SerialPort.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <stdio.h> diff --git a/core/jni/android_hardware_SoundTrigger.cpp b/core/jni/android_hardware_SoundTrigger.cpp index 0c7f5a116561..9dbb8d757e15 100644 --- a/core/jni/android_hardware_SoundTrigger.cpp +++ b/core/jni/android_hardware_SoundTrigger.cpp @@ -20,7 +20,7 @@ #include <utils/Log.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <system/sound_trigger.h> #include <soundtrigger/SoundTriggerCallback.h> diff --git a/core/jni/android_hardware_UsbDevice.cpp b/core/jni/android_hardware_UsbDevice.cpp index 89d33e2ace1c..879d40924690 100644 --- a/core/jni/android_hardware_UsbDevice.cpp +++ b/core/jni/android_hardware_UsbDevice.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <usbhost/usbhost.h> diff --git a/core/jni/android_hardware_UsbDeviceConnection.cpp b/core/jni/android_hardware_UsbDeviceConnection.cpp index ba08bce7d17b..d953aee6b753 100644 --- a/core/jni/android_hardware_UsbDeviceConnection.cpp +++ b/core/jni/android_hardware_UsbDeviceConnection.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <usbhost/usbhost.h> diff --git a/core/jni/android_hardware_UsbRequest.cpp b/core/jni/android_hardware_UsbRequest.cpp index 01fe078f6f16..9bdb60542858 100644 --- a/core/jni/android_hardware_UsbRequest.cpp +++ b/core/jni/android_hardware_UsbRequest.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <usbhost/usbhost.h> diff --git a/core/jni/android_hardware_camera2_CameraMetadata.cpp b/core/jni/android_hardware_camera2_CameraMetadata.cpp index c11ce0fe338e..040981db5451 100644 --- a/core/jni/android_hardware_camera2_CameraMetadata.cpp +++ b/core/jni/android_hardware_camera2_CameraMetadata.cpp @@ -28,7 +28,7 @@ #include <vector> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_os_Parcel.h" #include "core_jni_helpers.h" #include "android_runtime/android_hardware_camera2_CameraMetadata.h" diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp index 3d021d6cc6b2..c8eef7f3f2f8 100644 --- a/core/jni/android_hardware_camera2_DngCreator.cpp +++ b/core/jni/android_hardware_camera2_DngCreator.cpp @@ -46,7 +46,7 @@ #include "android_runtime/android_hardware_camera2_CameraMetadata.h" #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> using namespace android; using namespace img_utils; diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp index 71211948dac3..863ca8b0bc02 100644 --- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp +++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp @@ -22,7 +22,7 @@ #include <camera/CameraUtils.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include "android_runtime/android_view_Surface.h" #include "android_runtime/android_graphics_SurfaceTexture.h" diff --git a/core/jni/android_hardware_camera2_legacy_PerfMeasurement.cpp b/core/jni/android_hardware_camera2_legacy_PerfMeasurement.cpp index a08166568c9f..fac243a70415 100644 --- a/core/jni/android_hardware_camera2_legacy_PerfMeasurement.cpp +++ b/core/jni/android_hardware_camera2_legacy_PerfMeasurement.cpp @@ -21,7 +21,7 @@ #include <utils/Vector.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <ui/GraphicBuffer.h> diff --git a/core/jni/android_hardware_location_ActivityRecognitionHardware.cpp b/core/jni/android_hardware_location_ActivityRecognitionHardware.cpp index 637234f886f7..1c9ab9403298 100644 --- a/core/jni/android_hardware_location_ActivityRecognitionHardware.cpp +++ b/core/jni/android_hardware_location_ActivityRecognitionHardware.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "ActivityRecognitionHardware" #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/Log.h> diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp index 5e93fc97de3f..e4da3c6a6ac8 100644 --- a/core/jni/android_media_AudioRecord.cpp +++ b/core/jni/android_media_AudioRecord.cpp @@ -20,13 +20,13 @@ #include <inttypes.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <utils/Log.h> #include <media/AudioRecord.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include "android_media_AudioFormat.h" #include "android_media_AudioErrors.h" diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 226e9e366cd4..609111e95eb8 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -22,7 +22,7 @@ #include <sstream> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <media/AudioSystem.h> diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp index 3e9ffceb83f4..c7ed599d1b75 100644 --- a/core/jni/android_media_AudioTrack.cpp +++ b/core/jni/android_media_AudioTrack.cpp @@ -19,11 +19,11 @@ #include "android_media_AudioTrack.h" -#include <JNIHelp.h> -#include <JniConstants.h> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/JniConstants.h> #include "core_jni_helpers.h" -#include "ScopedBytes.h" +#include <nativehelper/ScopedBytes.h> #include <utils/Log.h> #include <media/AudioSystem.h> diff --git a/core/jni/android_media_DeviceCallback.cpp b/core/jni/android_media_DeviceCallback.cpp index e159373602c3..108fa00fe510 100644 --- a/core/jni/android_media_DeviceCallback.cpp +++ b/core/jni/android_media_DeviceCallback.cpp @@ -19,8 +19,8 @@ #define LOG_TAG "AudioDeviceCallback-JNI" #include <utils/Log.h> -#include <JNIHelp.h> -#include <JniConstants.h> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/JniConstants.h> #include "core_jni_helpers.h" #include <media/AudioSystem.h> diff --git a/core/jni/android_media_JetPlayer.cpp b/core/jni/android_media_JetPlayer.cpp index 873c3f2e07e1..da116bf7c96a 100644 --- a/core/jni/android_media_JetPlayer.cpp +++ b/core/jni/android_media_JetPlayer.cpp @@ -23,7 +23,7 @@ #include <fcntl.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <utils/Log.h> diff --git a/core/jni/android_media_RemoteDisplay.cpp b/core/jni/android_media_RemoteDisplay.cpp index bd1a6ecaf95c..3b517f1eafe0 100644 --- a/core/jni/android_media_RemoteDisplay.cpp +++ b/core/jni/android_media_RemoteDisplay.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "RemoteDisplay" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_os_Parcel.h" #include "android_util_Binder.h" @@ -36,7 +36,7 @@ #include <utils/Log.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> namespace android { diff --git a/core/jni/android_media_ToneGenerator.cpp b/core/jni/android_media_ToneGenerator.cpp index aec62631c559..ecb3cd60c42f 100644 --- a/core/jni/android_media_ToneGenerator.cpp +++ b/core/jni/android_media_ToneGenerator.cpp @@ -22,7 +22,7 @@ #include <fcntl.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <utils/Log.h> diff --git a/core/jni/android_net_LocalSocketImpl.cpp b/core/jni/android_net_LocalSocketImpl.cpp index 37b6df1e3d2c..6df23f72bdd3 100644 --- a/core/jni/android_net_LocalSocketImpl.cpp +++ b/core/jni/android_net_LocalSocketImpl.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "LocalSocketImpl" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include "utils/Log.h" #include "utils/misc.h" @@ -35,7 +35,7 @@ #include <cutils/sockets.h> #include <netinet/tcp.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> namespace android { diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp index 3e99521f8ad4..823f1cc36225 100644 --- a/core/jni/android_net_NetUtils.cpp +++ b/core/jni/android_net_NetUtils.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "NetUtils" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "NetdClient.h" #include <utils/misc.h> #include <android_runtime/AndroidRuntime.h> diff --git a/core/jni/android_net_TrafficStats.cpp b/core/jni/android_net_TrafficStats.cpp index 7b7d0cf498c3..d0c237da0777 100644 --- a/core/jni/android_net_TrafficStats.cpp +++ b/core/jni/android_net_TrafficStats.cpp @@ -25,7 +25,7 @@ #include "core_jni_helpers.h" #include <jni.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include <utils/misc.h> #include <utils/Log.h> diff --git a/core/jni/android_opengl_EGL14.cpp b/core/jni/android_opengl_EGL14.cpp index c8b178411251..616358866275 100644 --- a/core/jni/android_opengl_EGL14.cpp +++ b/core/jni/android_opengl_EGL14.cpp @@ -21,7 +21,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_Surface.h> #include <android_runtime/android_graphics_SurfaceTexture.h> diff --git a/core/jni/android_opengl_EGLExt.cpp b/core/jni/android_opengl_EGLExt.cpp index 62ccad4d85f0..df1aa2025b98 100644 --- a/core/jni/android_opengl_EGLExt.cpp +++ b/core/jni/android_opengl_EGLExt.cpp @@ -21,7 +21,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_Surface.h> #include <android_runtime/android_graphics_SurfaceTexture.h> diff --git a/core/jni/android_opengl_GLES10.cpp b/core/jni/android_opengl_GLES10.cpp index 5bcb8001e78e..6d4f6eccfdba 100644 --- a/core/jni/android_opengl_GLES10.cpp +++ b/core/jni/android_opengl_GLES10.cpp @@ -25,7 +25,7 @@ #include <GLES/glext.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/core/jni/android_opengl_GLES10Ext.cpp b/core/jni/android_opengl_GLES10Ext.cpp index 38f7ba6485ce..e630cfca64c8 100644 --- a/core/jni/android_opengl_GLES10Ext.cpp +++ b/core/jni/android_opengl_GLES10Ext.cpp @@ -25,7 +25,7 @@ #include <GLES/glext.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/core/jni/android_opengl_GLES11.cpp b/core/jni/android_opengl_GLES11.cpp index 014672dd2772..ab9cbb11a353 100644 --- a/core/jni/android_opengl_GLES11.cpp +++ b/core/jni/android_opengl_GLES11.cpp @@ -25,7 +25,7 @@ #include <GLES/glext.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/core/jni/android_opengl_GLES11Ext.cpp b/core/jni/android_opengl_GLES11Ext.cpp index b4a1ab68449e..8f71a6d7dc49 100644 --- a/core/jni/android_opengl_GLES11Ext.cpp +++ b/core/jni/android_opengl_GLES11Ext.cpp @@ -25,7 +25,7 @@ #include <GLES/glext.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/core/jni/android_opengl_GLES20.cpp b/core/jni/android_opengl_GLES20.cpp index c1ffa8106614..f83d20467ea8 100644 --- a/core/jni/android_opengl_GLES20.cpp +++ b/core/jni/android_opengl_GLES20.cpp @@ -25,7 +25,7 @@ #include <GLES2/gl2ext.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/core/jni/android_opengl_GLES30.cpp b/core/jni/android_opengl_GLES30.cpp index 1d12b0a862be..b649daf46607 100644 --- a/core/jni/android_opengl_GLES30.cpp +++ b/core/jni/android_opengl_GLES30.cpp @@ -25,7 +25,7 @@ #include <GLES3/gl3ext.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/core/jni/android_opengl_GLES31.cpp b/core/jni/android_opengl_GLES31.cpp index e0750e4c8ee0..07d920f87941 100644 --- a/core/jni/android_opengl_GLES31.cpp +++ b/core/jni/android_opengl_GLES31.cpp @@ -23,7 +23,7 @@ #include <stdint.h> #include <GLES3/gl31.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/core/jni/android_opengl_GLES31Ext.cpp b/core/jni/android_opengl_GLES31Ext.cpp index 8212eb1e47d2..723dd4cd0b87 100644 --- a/core/jni/android_opengl_GLES31Ext.cpp +++ b/core/jni/android_opengl_GLES31Ext.cpp @@ -24,7 +24,7 @@ #include <GLES2/gl2ext.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/core/jni/android_opengl_GLES32.cpp b/core/jni/android_opengl_GLES32.cpp index 91b573b0445d..62a6e6c61394 100644 --- a/core/jni/android_opengl_GLES32.cpp +++ b/core/jni/android_opengl_GLES32.cpp @@ -23,7 +23,7 @@ #include <stdint.h> #include <GLES3/gl32.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> #include <assert.h> diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp index 566312594d0b..81063204447f 100644 --- a/core/jni/android_os_HwBinder.cpp +++ b/core/jni/android_os_HwBinder.cpp @@ -25,7 +25,7 @@ #include <cstring> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android/hidl/manager/1.0/IServiceManager.h> #include <android/hidl/base/1.0/IBase.h> #include <android/hidl/base/1.0/BpHwBase.h> diff --git a/core/jni/android_os_HwBlob.cpp b/core/jni/android_os_HwBlob.cpp index 8590ecf3bb19..0c23797b627b 100644 --- a/core/jni/android_os_HwBlob.cpp +++ b/core/jni/android_os_HwBlob.cpp @@ -22,7 +22,7 @@ #include "android_os_HwParcel.h" -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <hidl/Status.h> #include <nativehelper/ScopedLocalRef.h> diff --git a/core/jni/android_os_HwParcel.cpp b/core/jni/android_os_HwParcel.cpp index 6ea809aa95ad..b412b6a016b6 100644 --- a/core/jni/android_os_HwParcel.cpp +++ b/core/jni/android_os_HwParcel.cpp @@ -24,7 +24,7 @@ #include "android_os_HwBlob.h" #include "android_os_HwRemoteBinder.h" -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <hidl/HidlTransportSupport.h> #include <hidl/Status.h> diff --git a/core/jni/android_os_HwRemoteBinder.cpp b/core/jni/android_os_HwRemoteBinder.cpp index 9c2ee9cfec45..cf59a56a13dc 100644 --- a/core/jni/android_os_HwRemoteBinder.cpp +++ b/core/jni/android_os_HwRemoteBinder.cpp @@ -22,10 +22,10 @@ #include "android_os_HwParcel.h" -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <hidl/Status.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include <nativehelper/ScopedLocalRef.h> #include "core_jni_helpers.h" diff --git a/core/jni/android_os_MemoryFile.cpp b/core/jni/android_os_MemoryFile.cpp index c198a733103d..19926e2ac155 100644 --- a/core/jni/android_os_MemoryFile.cpp +++ b/core/jni/android_os_MemoryFile.cpp @@ -19,7 +19,7 @@ #include <cutils/ashmem.h> #include "core_jni_helpers.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <unistd.h> #include <sys/mman.h> diff --git a/core/jni/android_os_MessageQueue.cpp b/core/jni/android_os_MessageQueue.cpp index e57a7190cfce..f7a98d16f2e3 100644 --- a/core/jni/android_os_MessageQueue.cpp +++ b/core/jni/android_os_MessageQueue.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "MessageQueue-JNI" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/Looper.h> diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp index d740a76f8c2e..8941002d4ee4 100644 --- a/core/jni/android_os_Parcel.cpp +++ b/core/jni/android_os_Parcel.cpp @@ -20,7 +20,7 @@ #include "android_os_Parcel.h" #include "android_util_Binder.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <fcntl.h> #include <stdio.h> @@ -41,8 +41,8 @@ #include <utils/threads.h> #include <utils/String8.h> -#include <ScopedUtfChars.h> -#include <ScopedLocalRef.h> +#include <nativehelper/ScopedUtfChars.h> +#include <nativehelper/ScopedLocalRef.h> #include <android_runtime/AndroidRuntime.h> diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp index 4b68c0dad038..6778b294a93c 100644 --- a/core/jni/android_os_SELinux.cpp +++ b/core/jni/android_os_SELinux.cpp @@ -17,15 +17,15 @@ #define LOG_TAG "SELinuxJNI" #include <utils/Log.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include "core_jni_helpers.h" #include "selinux/selinux.h" #include "selinux/android.h" #include <errno.h> #include <memory> -#include <ScopedLocalRef.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/ScopedUtfChars.h> namespace android { diff --git a/core/jni/android_os_SystemClock.cpp b/core/jni/android_os_SystemClock.cpp index 2fade6913e18..1f000d748b1f 100644 --- a/core/jni/android_os_SystemClock.cpp +++ b/core/jni/android_os_SystemClock.cpp @@ -25,7 +25,7 @@ #include <errno.h> #include <string.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include "core_jni_helpers.h" diff --git a/core/jni/android_os_Trace.cpp b/core/jni/android_os_Trace.cpp index de91f70ee8f5..4f4e5da22c8d 100644 --- a/core/jni/android_os_Trace.cpp +++ b/core/jni/android_os_Trace.cpp @@ -23,9 +23,9 @@ #include <utils/String8.h> #include <log/log.h> -#include <JNIHelp.h> -#include <ScopedUtfChars.h> -#include <ScopedStringChars.h> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedUtfChars.h> +#include <nativehelper/ScopedStringChars.h> namespace android { diff --git a/core/jni/android_os_UEventObserver.cpp b/core/jni/android_os_UEventObserver.cpp index 30d40a2a08ad..2df74b05d97b 100644 --- a/core/jni/android_os_UEventObserver.cpp +++ b/core/jni/android_os_UEventObserver.cpp @@ -21,13 +21,13 @@ #include "hardware_legacy/uevent.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <utils/Mutex.h> #include <utils/Vector.h> #include <utils/String8.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> namespace android { diff --git a/core/jni/android_os_VintfObject.cpp b/core/jni/android_os_VintfObject.cpp index 8b4cc91565b6..7ec4b8ea0799 100644 --- a/core/jni/android_os_VintfObject.cpp +++ b/core/jni/android_os_VintfObject.cpp @@ -21,7 +21,7 @@ #include <vector> #include <string> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <vintf/VintfObject.h> #include <vintf/parse_string.h> #include <vintf/parse_xml.h> diff --git a/core/jni/android_os_VintfRuntimeInfo.cpp b/core/jni/android_os_VintfRuntimeInfo.cpp index ecb685435a97..19220cf05adb 100644 --- a/core/jni/android_os_VintfRuntimeInfo.cpp +++ b/core/jni/android_os_VintfRuntimeInfo.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "VintfRuntimeInfo" //#define LOG_NDEBUG 0 -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <vintf/VintfObject.h> #include <vintf/parse_string.h> #include <vintf/parse_xml.h> diff --git a/core/jni/android_os_seccomp.cpp b/core/jni/android_os_seccomp.cpp index 45023713ea85..06e2a167de0a 100644 --- a/core/jni/android_os_seccomp.cpp +++ b/core/jni/android_os_seccomp.cpp @@ -15,7 +15,7 @@ */ #include "core_jni_helpers.h" -#include "JniConstants.h" +#include <nativehelper/JniConstants.h> #include "utils/Log.h" #include <selinux/selinux.h> diff --git a/core/jni/android_server_NetworkManagementSocketTagger.cpp b/core/jni/android_server_NetworkManagementSocketTagger.cpp index 818bf53d97a4..58295af50135 100644 --- a/core/jni/android_server_NetworkManagementSocketTagger.cpp +++ b/core/jni/android_server_NetworkManagementSocketTagger.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "NMST_QTagUidNative" #include <utils/Log.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include <utils/misc.h> diff --git a/core/jni/android_server_Watchdog.cpp b/core/jni/android_server_Watchdog.cpp index d1f943458d90..01d565b26ddb 100644 --- a/core/jni/android_server_Watchdog.cpp +++ b/core/jni/android_server_Watchdog.cpp @@ -25,7 +25,7 @@ #include <errno.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" static void dumpOneStack(int tid, int outFd) { diff --git a/core/jni/android_text_AndroidBidi.cpp b/core/jni/android_text_AndroidBidi.cpp index 8b7157261ea2..f72f0f0dc60a 100644 --- a/core/jni/android_text_AndroidBidi.cpp +++ b/core/jni/android_text_AndroidBidi.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "AndroidUnicode" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include "utils/misc.h" #include "utils/Log.h" diff --git a/core/jni/android_text_AndroidCharacter.cpp b/core/jni/android_text_AndroidCharacter.cpp index 474a74e8776c..8885aac49064 100644 --- a/core/jni/android_text_AndroidCharacter.cpp +++ b/core/jni/android_text_AndroidCharacter.cpp @@ -17,8 +17,8 @@ #define LOG_TAG "AndroidUnicode" -#include "JNIHelp.h" -#include "ScopedPrimitiveArray.h" +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedPrimitiveArray.h> #include "core_jni_helpers.h" #include "utils/misc.h" #include "utils/Log.h" diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp index 4a445d8705ca..91bfee9a555e 100644 --- a/core/jni/android_text_StaticLayout.cpp +++ b/core/jni/android_text_StaticLayout.cpp @@ -21,9 +21,9 @@ #include "unicode/brkiter.h" #include "utils/misc.h" #include "utils/Log.h" -#include "ScopedStringChars.h" -#include "ScopedPrimitiveArray.h" -#include "JNIHelp.h" +#include <nativehelper/ScopedStringChars.h> +#include <nativehelper/ScopedPrimitiveArray.h> +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <cstdint> #include <vector> diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 90aee9e22f77..b137da3ef792 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -37,9 +37,9 @@ #include "android_util_Binder.h" #include "core_jni_helpers.h" #include "jni.h" -#include "JNIHelp.h" -#include "ScopedStringChars.h" -#include "ScopedUtfChars.h" +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedStringChars.h> +#include <nativehelper/ScopedUtfChars.h> #include "utils/Log.h" #include "utils/misc.h" #include "utils/String8.h" diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index e2aa17b32d0b..5b0f7768c165 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -20,7 +20,7 @@ #include "android_os_Parcel.h" #include "android_util_Binder.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <fcntl.h> #include <inttypes.h> @@ -44,8 +44,8 @@ #include <utils/SystemClock.h> #include <utils/threads.h> -#include <ScopedUtfChars.h> -#include <ScopedLocalRef.h> +#include <nativehelper/ScopedUtfChars.h> +#include <nativehelper/ScopedLocalRef.h> #include "core_jni_helpers.h" diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp index 8a7600b319cd..9fd7c4041058 100644 --- a/core/jni/android_util_EventLog.cpp +++ b/core/jni/android_util_EventLog.cpp @@ -20,7 +20,7 @@ #include <log/log.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include "jni.h" diff --git a/core/jni/android_util_FileObserver.cpp b/core/jni/android_util_FileObserver.cpp index 2b93b6d61905..6f975b23e5bd 100644 --- a/core/jni/android_util_FileObserver.cpp +++ b/core/jni/android_util_FileObserver.cpp @@ -15,7 +15,7 @@ ** limitations under the License. */ -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include "utils/Log.h" #include "utils/misc.h" diff --git a/core/jni/android_util_Log.cpp b/core/jni/android_util_Log.cpp index 56505afc78b2..a6adc88f53fb 100644 --- a/core/jni/android_util_Log.cpp +++ b/core/jni/android_util_Log.cpp @@ -26,7 +26,7 @@ #include <utils/String8.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "utils/misc.h" #include "core_jni_helpers.h" #include "android_util_Log.h" diff --git a/core/jni/android_util_Log.h b/core/jni/android_util_Log.h index 4804a8547422..8a32864ff872 100644 --- a/core/jni/android_util_Log.h +++ b/core/jni/android_util_Log.h @@ -18,7 +18,7 @@ #define _ANDROID_UTIL_LOG_H #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> namespace android { diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp index e8c57716a9b0..c04c33979344 100644 --- a/core/jni/android_util_Process.cpp +++ b/core/jni/android_util_Process.cpp @@ -30,7 +30,7 @@ #include "core_jni_helpers.h" #include "android_util_Binder.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <dirent.h> #include <fcntl.h> diff --git a/core/jni/android_util_StringBlock.cpp b/core/jni/android_util_StringBlock.cpp index b396afe62dff..760f9e36ed3d 100644 --- a/core/jni/android_util_StringBlock.cpp +++ b/core/jni/android_util_StringBlock.cpp @@ -18,7 +18,7 @@ #define LOG_TAG "StringBlock" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <utils/misc.h> #include <core_jni_helpers.h> #include <utils/Log.h> diff --git a/core/jni/android_util_XmlBlock.cpp b/core/jni/android_util_XmlBlock.cpp index 99882cc002d7..ad6bad2dfb79 100644 --- a/core/jni/android_util_XmlBlock.cpp +++ b/core/jni/android_util_XmlBlock.cpp @@ -18,7 +18,7 @@ #define LOG_TAG "XmlBlock" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <core_jni_helpers.h> #include <androidfw/AssetManager.h> #include <androidfw/ResourceTypes.h> diff --git a/core/jni/android_util_jar_StrictJarFile.cpp b/core/jni/android_util_jar_StrictJarFile.cpp index 4f1f926c8a22..4ab8db4395f6 100644 --- a/core/jni/android_util_jar_StrictJarFile.cpp +++ b/core/jni/android_util_jar_StrictJarFile.cpp @@ -22,10 +22,10 @@ #include <log/log.h> -#include "JNIHelp.h" -#include "JniConstants.h" -#include "ScopedLocalRef.h" -#include "ScopedUtfChars.h" +#include <nativehelper/JNIHelp.h> +#include <nativehelper/JniConstants.h> +#include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/ScopedUtfChars.h> #include "jni.h" #include "ziparchive/zip_archive.h" diff --git a/core/jni/android_view_DisplayEventReceiver.cpp b/core/jni/android_view_DisplayEventReceiver.cpp index 831393bd0535..c1b5aaec1106 100644 --- a/core/jni/android_view_DisplayEventReceiver.cpp +++ b/core/jni/android_view_DisplayEventReceiver.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <inttypes.h> @@ -30,7 +30,7 @@ #include <gui/DisplayEventReceiver.h> #include "android_os_MessageQueue.h" -#include <ScopedLocalRef.h> +#include <nativehelper/ScopedLocalRef.h> #include "core_jni_helpers.h" diff --git a/core/jni/android_view_InputChannel.cpp b/core/jni/android_view_InputChannel.cpp index 1c6ead0f1086..71742cbbb180 100644 --- a/core/jni/android_view_InputChannel.cpp +++ b/core/jni/android_view_InputChannel.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "InputChannel-JNI" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <binder/Parcel.h> diff --git a/core/jni/android_view_InputDevice.cpp b/core/jni/android_view_InputDevice.cpp index 4e6e512b69df..494fad7900ef 100644 --- a/core/jni/android_view_InputDevice.cpp +++ b/core/jni/android_view_InputDevice.cpp @@ -20,7 +20,7 @@ #include <jni.h> #include <nativehelper/JNIHelp.h> -#include <ScopedLocalRef.h> +#include <nativehelper/ScopedLocalRef.h> #include "android_view_InputDevice.h" #include "android_view_KeyCharacterMap.h" diff --git a/core/jni/android_view_InputEventReceiver.cpp b/core/jni/android_view_InputEventReceiver.cpp index 8293cd8ff88d..31e954bf5b88 100644 --- a/core/jni/android_view_InputEventReceiver.cpp +++ b/core/jni/android_view_InputEventReceiver.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> @@ -31,7 +31,7 @@ #include "android_view_KeyEvent.h" #include "android_view_MotionEvent.h" -#include <ScopedLocalRef.h> +#include <nativehelper/ScopedLocalRef.h> #include "core_jni_helpers.h" diff --git a/core/jni/android_view_InputEventSender.cpp b/core/jni/android_view_InputEventSender.cpp index 3bd6917aedfa..420ff2a46814 100644 --- a/core/jni/android_view_InputEventSender.cpp +++ b/core/jni/android_view_InputEventSender.cpp @@ -18,7 +18,7 @@ //#define LOG_NDEBUG 0 -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> @@ -31,7 +31,7 @@ #include "android_view_KeyEvent.h" #include "android_view_MotionEvent.h" -#include <ScopedLocalRef.h> +#include <nativehelper/ScopedLocalRef.h> #include "core_jni_helpers.h" diff --git a/core/jni/android_view_InputQueue.cpp b/core/jni/android_view_InputQueue.cpp index 96ccdee20c7c..24c3ff80badd 100644 --- a/core/jni/android_view_InputQueue.cpp +++ b/core/jni/android_view_InputQueue.cpp @@ -26,9 +26,9 @@ #include <input/Input.h> #include <utils/Looper.h> #include <utils/TypeHelpers.h> -#include <ScopedLocalRef.h> +#include <nativehelper/ScopedLocalRef.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_os_MessageQueue.h" #include "android_view_KeyEvent.h" #include "android_view_MotionEvent.h" diff --git a/core/jni/android_view_KeyEvent.cpp b/core/jni/android_view_KeyEvent.cpp index 216e6f64a9f8..8a6e745b60a8 100644 --- a/core/jni/android_view_KeyEvent.cpp +++ b/core/jni/android_view_KeyEvent.cpp @@ -16,13 +16,13 @@ #define LOG_TAG "KeyEvent-JNI" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/Log.h> #include <utils/Log.h> #include <input/Input.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include "android_view_KeyEvent.h" #include "core_jni_helpers.h" diff --git a/core/jni/android_view_MotionEvent.cpp b/core/jni/android_view_MotionEvent.cpp index a9efb009ba9d..64bf0dc0ed91 100644 --- a/core/jni/android_view_MotionEvent.cpp +++ b/core/jni/android_view_MotionEvent.cpp @@ -16,14 +16,14 @@ #define LOG_TAG "MotionEvent-JNI" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <SkMatrix.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/Log.h> #include <utils/Log.h> #include <input/Input.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include "android_os_Parcel.h" #include "android_view_MotionEvent.h" #include "android_util_Binder.h" diff --git a/core/jni/android_view_PointerIcon.cpp b/core/jni/android_view_PointerIcon.cpp index 4150636cae12..4f79790dec51 100644 --- a/core/jni/android_view_PointerIcon.cpp +++ b/core/jni/android_view_PointerIcon.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "PointerIcon-JNI" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_view_PointerIcon.h" @@ -24,7 +24,7 @@ #include <android_runtime/Log.h> #include <utils/Log.h> #include <android/graphics/GraphicsJNI.h> -#include "ScopedLocalRef.h" +#include <nativehelper/ScopedLocalRef.h> #include "core_jni_helpers.h" diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp index 7744e0cd6b5d..ec3e06cbde7e 100644 --- a/core/jni/android_view_Surface.cpp +++ b/core/jni/android_view_Surface.cpp @@ -19,7 +19,7 @@ #include <stdio.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_os_Parcel.h" #include "android/graphics/GraphicBuffer.h" #include "android/graphics/GraphicsJNI.h" @@ -47,7 +47,7 @@ #include <utils/misc.h> #include <utils/Log.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include <AnimationContext.h> #include <FrameInfo.h> diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index c42ba710079a..19fa25eee6ce 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -25,8 +25,8 @@ #include "core_jni_helpers.h" #include <android-base/chrono_utils.h> -#include <JNIHelp.h> -#include <ScopedUtfChars.h> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedUtfChars.h> #include <android_runtime/android_view_Surface.h> #include <android_runtime/android_view_SurfaceSession.h> #include <gui/Surface.h> diff --git a/core/jni/android_view_SurfaceSession.cpp b/core/jni/android_view_SurfaceSession.cpp index 508d89795569..30c00302eefd 100644 --- a/core/jni/android_view_SurfaceSession.cpp +++ b/core/jni/android_view_SurfaceSession.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "SurfaceSession" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_SurfaceSession.h> diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp index c9251bcac835..a635269a351d 100644 --- a/core/jni/android_view_ThreadedRenderer.cpp +++ b/core/jni/android_view_ThreadedRenderer.cpp @@ -23,7 +23,7 @@ #include <nativehelper/JNIHelp.h> #include "core_jni_helpers.h" #include <GraphicsJNI.h> -#include <ScopedPrimitiveArray.h> +#include <nativehelper/ScopedPrimitiveArray.h> #include <gui/BufferItemConsumer.h> #include <gui/BufferQueue.h> diff --git a/core/jni/android_view_VelocityTracker.cpp b/core/jni/android_view_VelocityTracker.cpp index e1f2241bfd47..153789c7f933 100644 --- a/core/jni/android_view_VelocityTracker.cpp +++ b/core/jni/android_view_VelocityTracker.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "VelocityTracker-JNI" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/Log.h> @@ -24,7 +24,7 @@ #include <input/VelocityTracker.h> #include "android_view_MotionEvent.h" -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include "core_jni_helpers.h" diff --git a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp index f8f9efe2804f..fce5dd58d7f9 100644 --- a/core/jni/com_android_internal_content_NativeLibraryHelper.cpp +++ b/core/jni/com_android_internal_content_NativeLibraryHelper.cpp @@ -19,7 +19,7 @@ #include "core_jni_helpers.h" -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include <androidfw/ZipFileRO.h> #include <androidfw/ZipUtils.h> #include <utils/Log.h> diff --git a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp index 4a2b88142e78..0cb69359901d 100644 --- a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp +++ b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp @@ -24,9 +24,9 @@ #include <core_jni_helpers.h> #include <jni.h> -#include <ScopedUtfChars.h> -#include <ScopedLocalRef.h> -#include <ScopedPrimitiveArray.h> +#include <nativehelper/ScopedUtfChars.h> +#include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/ScopedPrimitiveArray.h> #include <utils/Log.h> #include <utils/misc.h> diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index cb53106dbf28..3887c76419cc 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -54,10 +54,10 @@ #include <processgroup/processgroup.h> #include "core_jni_helpers.h" -#include "JNIHelp.h" -#include "ScopedLocalRef.h" -#include "ScopedPrimitiveArray.h" -#include "ScopedUtfChars.h" +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/ScopedPrimitiveArray.h> +#include <nativehelper/ScopedUtfChars.h> #include "fd_utils.h" #include "nativebridge/native_bridge.h" diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index 1ac05f91b3c0..d6692ad1245b 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -15,7 +15,7 @@ ** limitations under the License. */ -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_Surface.h> #include <android_runtime/android_graphics_SurfaceTexture.h> diff --git a/core/jni/com_google_android_gles_jni_GLImpl.cpp b/core/jni/com_google_android_gles_jni_GLImpl.cpp index eeb92fce2640..ac23eca93014 100644 --- a/core/jni/com_google_android_gles_jni_GLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_GLImpl.cpp @@ -22,7 +22,7 @@ #pragma GCC diagnostic ignored "-Wunused-function" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> #include <utils/misc.h> diff --git a/core/jni/core_jni_helpers.h b/core/jni/core_jni_helpers.h index 3f169c365ca4..1325b0ce1ea7 100644 --- a/core/jni/core_jni_helpers.h +++ b/core/jni/core_jni_helpers.h @@ -17,7 +17,7 @@ #ifndef CORE_JNI_HELPERS #define CORE_JNI_HELPERS -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android_runtime/AndroidRuntime.h> namespace android { diff --git a/core/jni/include/android_runtime/android_view_InputQueue.h b/core/jni/include/android_runtime/android_view_InputQueue.h index ed37b0aa5083..ac8da586eed9 100644 --- a/core/jni/include/android_runtime/android_view_InputQueue.h +++ b/core/jni/include/android_runtime/android_view_InputQueue.h @@ -22,7 +22,7 @@ #include <utils/TypeHelpers.h> #include <utils/Vector.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> /* * Declare a concrete type for the NDK's AInputQueue forward declaration diff --git a/drm/jni/android_drm_DrmManagerClient.cpp b/drm/jni/android_drm_DrmManagerClient.cpp index 63fe8acedd54..52ea8e3b161f 100644 --- a/drm/jni/android_drm_DrmManagerClient.cpp +++ b/drm/jni/android_drm_DrmManagerClient.cpp @@ -19,8 +19,8 @@ #include <utils/Log.h> #include <jni.h> -#include <JNIHelp.h> -#include <ScopedLocalRef.h> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedLocalRef.h> #include <android_runtime/AndroidRuntime.h> #include <drm/DrmInfo.h> diff --git a/media/jni/android_media_ImageReader.cpp b/media/jni/android_media_ImageReader.cpp index ff115f70fb43..885bf03fc994 100644 --- a/media/jni/android_media_ImageReader.cpp +++ b/media/jni/android_media_ImageReader.cpp @@ -34,7 +34,7 @@ #include <grallocusage/GrallocUsageConversion.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <stdint.h> #include <inttypes.h> diff --git a/media/jni/android_media_ImageWriter.cpp b/media/jni/android_media_ImageWriter.cpp index 7c424d94899c..2c7499237841 100644 --- a/media/jni/android_media_ImageWriter.cpp +++ b/media/jni/android_media_ImageWriter.cpp @@ -26,7 +26,7 @@ #include <android_runtime/AndroidRuntime.h> #include <android_runtime/android_view_Surface.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <stdint.h> #include <inttypes.h> diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index 2178607152c6..8c965e74315d 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -27,7 +27,7 @@ #include "android_runtime/android_view_Surface.h" #include "android_util_Binder.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <android/media/IDescrambler.h> diff --git a/media/jni/android_media_MediaCodecList.cpp b/media/jni/android_media_MediaCodecList.cpp index de9bf1f528af..8de11caf7d7a 100644 --- a/media/jni/android_media_MediaCodecList.cpp +++ b/media/jni/android_media_MediaCodecList.cpp @@ -26,7 +26,7 @@ #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_media_Utils.h" using namespace android; diff --git a/media/jni/android_media_MediaCrypto.cpp b/media/jni/android_media_MediaCrypto.cpp index cbdb8ce32020..1b3c24fcde49 100644 --- a/media/jni/android_media_MediaCrypto.cpp +++ b/media/jni/android_media_MediaCrypto.cpp @@ -22,7 +22,7 @@ #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <binder/IServiceManager.h> #include <cutils/properties.h> diff --git a/media/jni/android_media_MediaDataSource.cpp b/media/jni/android_media_MediaDataSource.cpp index 2ab7e39fad17..8c38d887f82b 100644 --- a/media/jni/android_media_MediaDataSource.cpp +++ b/media/jni/android_media_MediaDataSource.cpp @@ -23,7 +23,7 @@ #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <binder/MemoryDealer.h> #include <drm/drm_framework_common.h> diff --git a/media/jni/android_media_MediaDrm.cpp b/media/jni/android_media_MediaDrm.cpp index ea35f78a3a7a..d0c2aea1affc 100644 --- a/media/jni/android_media_MediaDrm.cpp +++ b/media/jni/android_media_MediaDrm.cpp @@ -24,7 +24,7 @@ #include "android_runtime/Log.h" #include "android_os_Parcel.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <binder/IServiceManager.h> #include <binder/Parcel.h> diff --git a/media/jni/android_media_MediaHTTPConnection.cpp b/media/jni/android_media_MediaHTTPConnection.cpp index fa0b43fedcef..365e045689f0 100644 --- a/media/jni/android_media_MediaHTTPConnection.cpp +++ b/media/jni/android_media_MediaHTTPConnection.cpp @@ -27,7 +27,7 @@ #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> namespace android { diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index f4e940d6cb21..4f1a145b8709 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -28,7 +28,7 @@ #include <private/media/VideoFrame.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include "android_media_MediaDataSource.h" #include "android_media_Utils.h" diff --git a/media/jni/android_media_MediaMuxer.cpp b/media/jni/android_media_MediaMuxer.cpp index c3461f0aa57c..f11452a9d80d 100644 --- a/media/jni/android_media_MediaMuxer.cpp +++ b/media/jni/android_media_MediaMuxer.cpp @@ -21,7 +21,7 @@ #include "android_media_Utils.h" #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <unistd.h> #include <fcntl.h> diff --git a/media/jni/android_media_MediaPlayer.cpp b/media/jni/android_media_MediaPlayer.cpp index 3711462532ee..c8ec7c4a3ba5 100644 --- a/media/jni/android_media_MediaPlayer.cpp +++ b/media/jni/android_media_MediaPlayer.cpp @@ -32,7 +32,7 @@ #include <fcntl.h> #include <utils/threads.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" #include "android_runtime/Log.h" diff --git a/media/jni/android_media_MediaProfiles.cpp b/media/jni/android_media_MediaProfiles.cpp index 580004304170..5bc80925eca4 100644 --- a/media/jni/android_media_MediaProfiles.cpp +++ b/media/jni/android_media_MediaProfiles.cpp @@ -22,7 +22,7 @@ #include <utils/threads.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include <media/MediaProfiles.h> diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp index 0f3c61f53a2c..3b475b2d70c8 100644 --- a/media/jni/android_media_MediaScanner.cpp +++ b/media/jni/android_media_MediaScanner.cpp @@ -24,7 +24,7 @@ #include <private/media/VideoFrame.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/media/jni/android_media_MediaSync.cpp b/media/jni/android_media_MediaSync.cpp index 6de5ea9e9f66..f75200868a0d 100644 --- a/media/jni/android_media_MediaSync.cpp +++ b/media/jni/android_media_MediaSync.cpp @@ -26,7 +26,7 @@ #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <gui/Surface.h> diff --git a/media/jni/android_media_ResampleInputStream.cpp b/media/jni/android_media_ResampleInputStream.cpp index fa755242a86b..3d8f517ca3a1 100644 --- a/media/jni/android_media_ResampleInputStream.cpp +++ b/media/jni/android_media_ResampleInputStream.cpp @@ -27,7 +27,7 @@ #include <utils/threads.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" diff --git a/media/jni/android_media_SyncParams.cpp b/media/jni/android_media_SyncParams.cpp index d9b2f1d7f43c..2d9738d8a34f 100644 --- a/media/jni/android_media_SyncParams.cpp +++ b/media/jni/android_media_SyncParams.cpp @@ -16,7 +16,7 @@ #include "android_media_SyncParams.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> namespace android { diff --git a/media/jni/android_media_Utils.h b/media/jni/android_media_Utils.h index af2f2d7bbe5d..821c6b25c333 100644 --- a/media/jni/android_media_Utils.h +++ b/media/jni/android_media_Utils.h @@ -23,7 +23,7 @@ #include <android_runtime/AndroidRuntime.h> #include <gui/CpuConsumer.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <utils/KeyedVector.h> #include <utils/String8.h> #include <SkStream.h> diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp index f7f791696dd3..cf4458a6fd49 100644 --- a/media/jni/android_mtp_MtpDatabase.cpp +++ b/media/jni/android_mtp_MtpDatabase.cpp @@ -39,7 +39,7 @@ extern "C" { #include <android_runtime/AndroidRuntime.h> #include <android_runtime/Log.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <nativehelper/ScopedLocalRef.h> #include <assert.h> diff --git a/media/jni/android_mtp_MtpDevice.cpp b/media/jni/android_mtp_MtpDevice.cpp index 768ac1d0a4cb..d42c39e99930 100644 --- a/media/jni/android_mtp_MtpDevice.cpp +++ b/media/jni/android_mtp_MtpDevice.cpp @@ -29,8 +29,8 @@ #include <string> #include "jni.h" -#include "JNIHelp.h" -#include "ScopedPrimitiveArray.h" +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedPrimitiveArray.h> #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/media/jni/android_mtp_MtpServer.cpp b/media/jni/android_mtp_MtpServer.cpp index c325f4ef078b..e9e93099c1e2 100644 --- a/media/jni/android_mtp_MtpServer.cpp +++ b/media/jni/android_mtp_MtpServer.cpp @@ -25,7 +25,7 @@ #include <utils/threads.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include "private/android_filesystem_config.h" diff --git a/media/jni/audioeffect/android_media_AudioEffect.cpp b/media/jni/audioeffect/android_media_AudioEffect.cpp index 1f93b34c9186..48ddf9a95861 100644 --- a/media/jni/audioeffect/android_media_AudioEffect.cpp +++ b/media/jni/audioeffect/android_media_AudioEffect.cpp @@ -25,7 +25,7 @@ #include <android_runtime/AndroidRuntime.h> #include "media/AudioEffect.h" -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> using namespace android; diff --git a/media/jni/audioeffect/android_media_Visualizer.cpp b/media/jni/audioeffect/android_media_Visualizer.cpp index f0cfeef197d8..b7d7b0339376 100644 --- a/media/jni/audioeffect/android_media_Visualizer.cpp +++ b/media/jni/audioeffect/android_media_Visualizer.cpp @@ -26,7 +26,7 @@ #include <utils/threads.h> #include "media/Visualizer.h" -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> using namespace android; diff --git a/native/android/asset_manager.cpp b/native/android/asset_manager.cpp index 0e5e5c60d506..98e9a42d944d 100644 --- a/native/android/asset_manager.cpp +++ b/native/android/asset_manager.cpp @@ -24,7 +24,7 @@ #include <utils/threads.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> using namespace android; diff --git a/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp index 6be48491ef10..53cdc9d96b43 100644 --- a/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp +++ b/packages/DefaultContainerService/jni/com_android_defcontainer_MeasurementUtils.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "DefContainer-JNI" -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <diskusage/dirsize.h> #include <utils/Log.h> diff --git a/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp b/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp index 1ce3949bbb81..7ff9cedab5f7 100644 --- a/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp +++ b/packages/PrintSpooler/jni/com_android_printspooler_util_BitmapSerializeUtils.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "BitmapSerializeUtils" #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android/bitmap.h> #include <android/log.h> diff --git a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp index 990d7707cdfb..846ff2517d12 100644 --- a/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp +++ b/packages/services/PacProcessor/jni/com_android_pacprocessor_PacNative.cpp @@ -21,7 +21,7 @@ #include "android_runtime/AndroidRuntime.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "proxy_resolver_v8.h" diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index c059973ed437..5070e39129ab 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -30,7 +30,7 @@ #include <android-base/macros.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" #include "android_runtime/android_util_AssetManager.h" diff --git a/services/core/jni/com_android_server_AlarmManagerService.cpp b/services/core/jni/com_android_server_AlarmManagerService.cpp index 3a0273d8c3c8..bcb0b4fcbe0b 100644 --- a/services/core/jni/com_android_server_AlarmManagerService.cpp +++ b/services/core/jni/com_android_server_AlarmManagerService.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "AlarmManagerService" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include <utils/Log.h> #include <utils/misc.h> diff --git a/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp b/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp index ba3be67bb400..5f67ac1dfe8f 100644 --- a/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp +++ b/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "HardwarePropertiesManagerService-JNI" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include <math.h> diff --git a/services/core/jni/com_android_server_PersistentDataBlockService.cpp b/services/core/jni/com_android_server_PersistentDataBlockService.cpp index f94e5d9d438c..97e69fb4bb40 100644 --- a/services/core/jni/com_android_server_PersistentDataBlockService.cpp +++ b/services/core/jni/com_android_server_PersistentDataBlockService.cpp @@ -15,9 +15,9 @@ */ #include <android_runtime/AndroidRuntime.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <jni.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include <utils/misc.h> #include <sys/ioctl.h> diff --git a/services/core/jni/com_android_server_SerialService.cpp b/services/core/jni/com_android_server_SerialService.cpp index 1bd7a599ed60..aef0b25503c8 100644 --- a/services/core/jni/com_android_server_SerialService.cpp +++ b/services/core/jni/com_android_server_SerialService.cpp @@ -18,7 +18,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include <sys/types.h> diff --git a/services/core/jni/com_android_server_SystemServer.cpp b/services/core/jni/com_android_server_SystemServer.cpp index 470cc572e3e5..3901cebcc787 100644 --- a/services/core/jni/com_android_server_SystemServer.cpp +++ b/services/core/jni/com_android_server_SystemServer.cpp @@ -15,7 +15,7 @@ */ #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <hidl/HidlTransportSupport.h> diff --git a/services/core/jni/com_android_server_UsbDeviceManager.cpp b/services/core/jni/com_android_server_UsbDeviceManager.cpp index 3733a55e7504..f37f87060fa6 100644 --- a/services/core/jni/com_android_server_UsbDeviceManager.cpp +++ b/services/core/jni/com_android_server_UsbDeviceManager.cpp @@ -18,7 +18,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/services/core/jni/com_android_server_UsbHostManager.cpp b/services/core/jni/com_android_server_UsbHostManager.cpp index a2b79ffe30c3..88ae824c1447 100644 --- a/services/core/jni/com_android_server_UsbHostManager.cpp +++ b/services/core/jni/com_android_server_UsbHostManager.cpp @@ -18,7 +18,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/services/core/jni/com_android_server_UsbMidiDevice.cpp b/services/core/jni/com_android_server_UsbMidiDevice.cpp index e12a01661a44..79d935fe610c 100644 --- a/services/core/jni/com_android_server_UsbMidiDevice.cpp +++ b/services/core/jni/com_android_server_UsbMidiDevice.cpp @@ -19,7 +19,7 @@ #include "utils/Log.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include "android_runtime/Log.h" diff --git a/services/core/jni/com_android_server_VibratorService.cpp b/services/core/jni/com_android_server_VibratorService.cpp index 76ce890717d7..810d785a9811 100644 --- a/services/core/jni/com_android_server_VibratorService.cpp +++ b/services/core/jni/com_android_server_VibratorService.cpp @@ -20,7 +20,7 @@ #include <android/hardware/vibrator/1.0/types.h> #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include <utils/misc.h> diff --git a/services/core/jni/com_android_server_am_BatteryStatsService.cpp b/services/core/jni/com_android_server_am_BatteryStatsService.cpp index 57bb9fedc135..fbd414143a41 100644 --- a/services/core/jni/com_android_server_am_BatteryStatsService.cpp +++ b/services/core/jni/com_android_server_am_BatteryStatsService.cpp @@ -32,8 +32,8 @@ #include <android_runtime/AndroidRuntime.h> #include <jni.h> -#include <ScopedLocalRef.h> -#include <ScopedPrimitiveArray.h> +#include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/ScopedPrimitiveArray.h> #include <log/log.h> #include <utils/misc.h> diff --git a/services/core/jni/com_android_server_connectivity_Vpn.cpp b/services/core/jni/com_android_server_connectivity_Vpn.cpp index 4d85d9a558aa..b6bea11a66ea 100644 --- a/services/core/jni/com_android_server_connectivity_Vpn.cpp +++ b/services/core/jni/com_android_server_connectivity_Vpn.cpp @@ -38,7 +38,7 @@ #include "netutils/ifc.h" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> namespace android { diff --git a/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp b/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp index 4e5c27fca784..87312f82d58a 100644 --- a/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp +++ b/services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp @@ -18,7 +18,7 @@ #include <error.h> #include <hidl/HidlSupport.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <linux/netfilter/nfnetlink.h> #include <linux/netlink.h> #include <sys/socket.h> diff --git a/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp b/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp index 39474ece0d21..503f0cf993d4 100644 --- a/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp +++ b/services/core/jni/com_android_server_fingerprint_FingerprintService.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "Fingerprint-JNI" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include <inttypes.h> #include <android_runtime/AndroidRuntime.h> diff --git a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp index 4df72560dc97..c22109c7816a 100644 --- a/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp +++ b/services/core/jni/com_android_server_hdmi_HdmiCecController.cpp @@ -18,8 +18,8 @@ #define LOG_NDEBUG 1 -#include <JNIHelp.h> -#include <ScopedPrimitiveArray.h> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedPrimitiveArray.h> #include <android/hardware/tv/cec/1.0/IHdmiCec.h> #include <android/hardware/tv/cec/1.0/IHdmiCecCallback.h> diff --git a/services/core/jni/com_android_server_input_InputApplicationHandle.cpp b/services/core/jni/com_android_server_input_InputApplicationHandle.cpp index e927b6031841..232b2c2c8c86 100644 --- a/services/core/jni/com_android_server_input_InputApplicationHandle.cpp +++ b/services/core/jni/com_android_server_input_InputApplicationHandle.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "InputApplicationHandle" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include <android_runtime/AndroidRuntime.h> #include <utils/threads.h> diff --git a/services/core/jni/com_android_server_input_InputApplicationHandle.h b/services/core/jni/com_android_server_input_InputApplicationHandle.h index e6f25cce1f98..c9af711a7586 100644 --- a/services/core/jni/com_android_server_input_InputApplicationHandle.h +++ b/services/core/jni/com_android_server_input_InputApplicationHandle.h @@ -19,7 +19,7 @@ #include <inputflinger/InputApplication.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" namespace android { diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index 6f24e7e6197f..ad617bcfa986 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -25,7 +25,7 @@ #define DEBUG_INPUT_DISPATCHER_POLICY 0 -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include <atomic> #include <cinttypes> @@ -50,9 +50,9 @@ #include <android_view_PointerIcon.h> #include <android/graphics/GraphicsJNI.h> -#include <ScopedLocalRef.h> -#include <ScopedPrimitiveArray.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedLocalRef.h> +#include <nativehelper/ScopedPrimitiveArray.h> +#include <nativehelper/ScopedUtfChars.h> #include "com_android_server_power_PowerManagerService.h" #include "com_android_server_input_InputApplicationHandle.h" diff --git a/services/core/jni/com_android_server_input_InputWindowHandle.cpp b/services/core/jni/com_android_server_input_InputWindowHandle.cpp index 197d05661976..2b2a6fac9b6a 100644 --- a/services/core/jni/com_android_server_input_InputWindowHandle.cpp +++ b/services/core/jni/com_android_server_input_InputWindowHandle.cpp @@ -16,7 +16,7 @@ #define LOG_TAG "InputWindowHandle" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include <android_runtime/AndroidRuntime.h> #include <utils/threads.h> diff --git a/services/core/jni/com_android_server_input_InputWindowHandle.h b/services/core/jni/com_android_server_input_InputWindowHandle.h index 8d9e7d777636..44d4620c8b0c 100644 --- a/services/core/jni/com_android_server_input_InputWindowHandle.h +++ b/services/core/jni/com_android_server_input_InputWindowHandle.h @@ -19,7 +19,7 @@ #include <inputflinger/InputWindow.h> -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" namespace android { diff --git a/services/core/jni/com_android_server_lights_LightsService.cpp b/services/core/jni/com_android_server_lights_LightsService.cpp index c873bdc1bd5a..c90113f4b44e 100644 --- a/services/core/jni/com_android_server_lights_LightsService.cpp +++ b/services/core/jni/com_android_server_lights_LightsService.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "LightsService" #include "jni.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "android_runtime/AndroidRuntime.h" #include <android/hardware/light/2.0/ILight.h> diff --git a/services/core/jni/com_android_server_power_PowerManagerService.h b/services/core/jni/com_android_server_power_PowerManagerService.h index f5fd3d6ecad1..a17fd650522b 100644 --- a/services/core/jni/com_android_server_power_PowerManagerService.h +++ b/services/core/jni/com_android_server_power_PowerManagerService.h @@ -17,7 +17,7 @@ #ifndef _ANDROID_SERVER_POWER_MANAGER_SERVICE_H #define _ANDROID_SERVER_POWER_MANAGER_SERVICE_H -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include <powermanager/PowerManager.h> diff --git a/services/core/jni/com_android_server_tv_TvInputHal.cpp b/services/core/jni/com_android_server_tv_TvInputHal.cpp index 78c0fa7d334a..93c4829568f9 100644 --- a/services/core/jni/com_android_server_tv_TvInputHal.cpp +++ b/services/core/jni/com_android_server_tv_TvInputHal.cpp @@ -21,7 +21,7 @@ #include "android_os_MessageQueue.h" #include "android_runtime/AndroidRuntime.h" #include "android_runtime/android_view_Surface.h" -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include <android/hardware/tv/input/1.0/ITvInputCallback.h> diff --git a/services/core/jni/com_android_server_tv_TvUinputBridge.cpp b/services/core/jni/com_android_server_tv_TvUinputBridge.cpp index de115c80938b..980922a806f5 100644 --- a/services/core/jni/com_android_server_tv_TvUinputBridge.cpp +++ b/services/core/jni/com_android_server_tv_TvUinputBridge.cpp @@ -20,7 +20,7 @@ #include "jni.h" #include <android_runtime/AndroidRuntime.h> -#include <ScopedUtfChars.h> +#include <nativehelper/ScopedUtfChars.h> #include <android/keycodes.h> #include <utils/BitSet.h> diff --git a/services/core/jni/com_android_server_vr_VrManagerService.cpp b/services/core/jni/com_android_server_vr_VrManagerService.cpp index 905269792fef..c675080d5f49 100644 --- a/services/core/jni/com_android_server_vr_VrManagerService.cpp +++ b/services/core/jni/com_android_server_vr_VrManagerService.cpp @@ -18,7 +18,7 @@ #include <android_runtime/AndroidRuntime.h> #include <jni.h> -#include <JNIHelp.h> +#include <nativehelper/JNIHelp.h> #include <android/hardware/vr/1.0/IVr.h> #include <utils/Errors.h> diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp index 2c05b55eca27..69e46e7a6905 100644 --- a/services/core/jni/onload.cpp +++ b/services/core/jni/onload.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "JNIHelp.h" +#include <nativehelper/JNIHelp.h> #include "jni.h" #include "utils/Log.h" #include "utils/misc.h" diff --git a/tests/net/jni/apf_jni.cpp b/tests/net/jni/apf_jni.cpp index dc108c1c282b..d415d225e7df 100644 --- a/tests/net/jni/apf_jni.cpp +++ b/tests/net/jni/apf_jni.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include <JNIHelp.h> -#include <ScopedUtfChars.h> +#include <nativehelper/JNIHelp.h> +#include <nativehelper/ScopedUtfChars.h> #include <jni.h> #include <pcap.h> #include <stdlib.h> |