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

Commit 47640f51 authored by Orion Hodson's avatar Orion Hodson Committed by Gerrit Code Review
Browse files

Merge changes from topic "lnh-platform-split" 

* changes:
  Update to use nativehelper/JNIPlatformHelp.h
  Sync with libnativehelper refactoring
parents 79c47faf b3459d4f

core/jni/android/graphics/BitmapFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include "core_jni_helpers.h"



#include <HardwareBitmapUploader.h>

#include <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.h>

#include <androidfw/Asset.h>

#include <androidfw/ResourceTypes.h>

#include <cutils/compiler.h>

core/jni/android_app_ActivityThread.cpp

+2 −1
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ 
 */



#include "jni.h"



#include "GraphicsJNI.h"

#include <nativehelper/JNIHelp.h>

#include <nativehelper/JNIPlatformHelp.h>



#include <minikin/Layout.h>

#include <renderthread/RenderProxy.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>