Unified Diff: libadblockplus-android/jni/Utils.h
Issue 29424615:
Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback (Closed)
Patch Set: using method from c++ utils
Created April 28, 2017, 10:44 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« libadblockplus-android/jni/JniJsEngine.cpp ('K')
|
« libadblockplus-android/jni/JniLibrary.cpp ('k')
|
libadblockplus-android/src/org/adblockplus/libadblockplus/FileSystem.java » ('j')
|
libadblockplus-android/src/org/adblockplus/libadblockplus/FileSystem.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: libadblockplus-android/jni/Utils.h |
| diff --git a/libadblockplus-android/jni/Utils.h b/libadblockplus-android/jni/Utils.h |
| index a79518cacc76b3541dbcd649a77fdb1bc9ccdc01..eda58c8ad526260ffb9f664554c349f09b97caaf 100644 |
| --- a/libadblockplus-android/jni/Utils.h |
| +++ b/libadblockplus-android/jni/Utils.h |
| @@ -31,6 +31,14 @@ |
| #define ABP_JNI_VERSION JNI_VERSION_1_6 |
| +namespace AdblockPlus |
| +{ |
| + namespace Utils |
| + { |
| + std::string Slurp(std::istream& stream); |
| + } |
| +} |
| + |
| void JniUtils_OnLoad(JavaVM* vm, JNIEnv* env, void* reserved); |
| void JniUtils_OnUnload(JavaVM* vm, JNIEnv* env, void* reserved); |
| @@ -154,6 +162,7 @@ inline T* JniLongToTypePtr(jlong value) |
| std::string JniJavaToStdString(JNIEnv* env, jstring str); |
| jstring JniStdStringToJava(JNIEnv* env, std::string str); |
| + |
|
sergei
2017/05/22 12:09:07
This line seems unrelated.
anton
2017/05/22 13:04:38
Acknowledged.
|
| jmethodID JniGetAddToListMethod(JNIEnv* env, jobject list); |
| void JniAddObjectToList(JNIEnv* env, jobject list, jmethodID addMethod, jobject value); |
