Issue 4146 - Fix failing UpdateCheckTest.testApplicationUpdateAvailable test in libadblockplus-andr…

libadblockplus-android/jni/JniLibrary.cpp

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "JniJsValue.h"
 

[anton, 2016/09/16 11:06:04]

added #include "Utils.h" for ABP_JNI_VERSION to be available in final commit

-#define JNI_REQUIRED_VERSION (JNI_VERSION_1_6)

[Felix Dahlke, 2016/09/15 15:05:56]

I actually just noticed that there is already a define for this, it's
ABP_JNI_VERSION from Utils.h - I guess we should use that one.

[anton, 2016/09/16 05:48:44]

Acknowledged.

-
 jint JNI_OnLoad(JavaVM* vm, void* reserved)
 {
   JNIEnv* env;
-  if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_REQUIRED_VERSION) != JNI_OK)
+  if (vm->GetEnv(reinterpret_cast<void**>(&env), ABP_JNI_VERSION) != JNI_OK)
   {
     return JNI_ERR;
   }
 
   JniJsValue_OnLoad(vm, env, reserved);
 
-  return JNI_REQUIRED_VERSION;
+  return ABP_JNI_VERSION;
 }
 
 void JNI_OnUnload(JavaVM* vm, void* reserved)
 {
   JNIEnv* env;
-  if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_REQUIRED_VERSION) != JNI_OK)
+  if (vm->GetEnv(reinterpret_cast<void**>(&env), ABP_JNI_VERSION) != JNI_OK)
   {
     return;
   }
 
   JniJsValue_OnUnload(vm, env, reserved);
 }