Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 196ad727 authored by Orion Hodson's avatar Orion Hodson Committed by Android (Google) Code Review
Browse files

Merge changes from topic "lnh-platform-split" 

* changes:
  Sync with libnativehelper refactoring
  Update to use nativehelper/JNIPlatformHelp.h
parents 018d1a4e 3ada1136

core/jni/android_app_ActivityThread.cpp

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */



#include "jni.h"

#include <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.h>



#include "core_jni_helpers.h"

#include <unistd.h>

core/jni/android_backup_BackupDataInput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "FileBackupHelper_native"

#include <utils/Log.h>



#include <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.h>

#include <android_runtime/AndroidRuntime.h>



#include <androidfw/BackupHelpers.h>

core/jni/android_backup_BackupDataOutput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "FileBackupHelper_native"

#include <utils/Log.h>



#include <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.h>

#include "core_jni_helpers.h"



#include <androidfw/BackupHelpers.h>

core/jni/android_backup_BackupHelperDispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "BackupHelperDispatcher_native"

#include <utils/Log.h>



#include <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.h>

#include <android_runtime/AndroidRuntime.h>



#include <sys/types.h>

core/jni/android_backup_FileBackupHelperBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "FileBackupHelper_native"

#include <utils/Log.h>



#include <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.h>

#include "core_jni_helpers.h"



#include <androidfw/BackupHelpers.h>