libadblockplus-android/jni/JniLibrary.cpp - Issue 29424615: Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback - Code Review

Rietveld Code Review Tool

Help | Bug tracker | Discussion group | Source code

Issues

Unified Diff: libadblockplus-android/jni/JniLibrary.cpp

Issue 29424615: Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback (Closed)

Patch Set: now using smart_ptr, changed impl for reading file as string, minor changes Created May 22, 2017, 1:03 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « libadblockplus-android/jni/JniJsEngine.cpp ('k') | libadblockplus-android/jni/Utils.h » ('j') | libadblockplus-android/src/org/adblockplus/libadblockplus/FileSystemUtils.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: libadblockplus-android/jni/JniLibrary.cpp

diff --git a/libadblockplus-android/jni/JniLibrary.cpp b/libadblockplus-android/jni/JniLibrary.cpp

index 27da9be2588237c1b0abd3524882c6c7a2f83978..2e5812b6efba9ad3e5df46ea94ad68813a3d5491 100644

--- a/libadblockplus-android/jni/JniLibrary.cpp

+++ b/libadblockplus-android/jni/JniLibrary.cpp

@@ -21,6 +21,7 @@

#include "JniCallbacks.h"

#include "JniNotification.h"

#include "JniWebRequest.h"

+#include "JniFileSystem.h"

#include "Utils.h"

jint JNI_OnLoad(JavaVM* vm, void* reserved)

@@ -37,6 +38,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)

JniCallbacks_OnLoad(vm, env, reserved);

JniNotification_OnLoad(vm, env, reserved);

JniWebRequest_OnLoad(vm, env, reserved);

+ JniFileSystem_OnLoad(vm, env, reserved);

JniUtils_OnLoad(vm, env, reserved);

return ABP_JNI_VERSION;

@@ -56,5 +58,6 @@ void JNI_OnUnload(JavaVM* vm, void* reserved)

JniCallbacks_OnUnload(vm, env, reserved);

JniNotification_OnUnload(vm, env, reserved);

JniWebRequest_OnUnload(vm, env, reserved);

+ JniFileSystem_OnUnload(vm, env, reserved);

JniUtils_OnUnload(vm, env, reserved);

}

« no previous file with comments | « libadblockplus-android/jni/JniJsEngine.cpp ('k') | libadblockplus-android/jni/Utils.h » ('j') | libadblockplus-android/src/org/adblockplus/libadblockplus/FileSystemUtils.java » ('J')

Powered by Google App Engine

This is Rietveld