Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

jni/Android.mk

Index: jni/Android.mk
diff --git a/jni/Android.mk b/jni/Android.mk
index 8224da51e8d62724939f581fe14a7de316a53324..75cbef5e7b6e87ab9e998d49bdc5df835b828650 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -3,21 +3,21 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libadblockplus
-LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libadblockplus.a
+LOCAL_SRC_FILES := ./libadblockplus-binaries/android_armeabi-v7a/libadblockplus.a
 
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := v8-base
-LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_base.a
+LOCAL_SRC_FILES := ./libadblockplus-binaries/android_armeabi-v7a/libv8_base.a
 
 include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := v8-snapshot
-LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_snapshot.a
+LOCAL_SRC_FILES := ./libadblockplus-binaries/android_armeabi-v7a/libv8_snapshot.a
 
 include $(PREBUILT_STATIC_LIBRARY)
 
@@ -29,10 +29,10 @@ LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp
 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp
 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp
 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp
-LOCAL_SRC_FILES += JniNotification.cpp
+LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp
 
 LOCAL_CPP_FEATURES := exceptions 
-LOCAL_CFLAGS += -std=gnu++0x
+LOCAL_CPPFLAGS += -std=c++11
 
 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/
 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot