Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: libadblockplus-android/jni/Android.mk

Issue 29756808: Issue 6597 - Update libadblockplus dependency to revision hg:a11c50751bfd (Closed)
Patch Set: fixed versionCode Created April 20, 2018, 8:13 a.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
Download patch
« no previous file with comments | « libadblockplus-android/build.gradle ('k') | libadblockplus-android/jni/Application.mk » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libadblockplus-android/jni/Android.mk
diff --git a/libadblockplus-android/jni/Android.mk b/libadblockplus-android/jni/Android.mk
index c3612b49dd6b96c3342c14ae654ffb9dccc99e92..48a8b8f90f4ef910f7f0b93c3afd48493cf819f4 100755
--- a/libadblockplus-android/jni/Android.mk
+++ b/libadblockplus-android/jni/Android.mk
@@ -106,10 +106,12 @@ LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp
LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp
LOCAL_CPP_FEATURES := exceptions
-LOCAL_CPPFLAGS += -std=c++11
LOCAL_C_INCLUDES := $(SHARED_V8_INCLUDE_DIR)
+LOCAL_LDFLAGS += -Wl,--allow-multiple-definition
+LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
+
LOCAL_STATIC_LIBRARIES := libadblockplus v8-libplatform
ifeq ($(SHARED_V8_LIB_FILENAMES),)
« no previous file with comments | « libadblockplus-android/build.gradle ('k') | libadblockplus-android/jni/Application.mk » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld