Side by Side 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.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« libadblockplus-android/build.gradle ('k')
|
libadblockplus-android/jni/Application.mk » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 LOCAL_PATH := $(call my-dir) | 1 LOCAL_PATH := $(call my-dir) |
| 2 | 2 |
| 3 # SHARED_V8_LIB_DIR is expected to be full absolute path if set by user | 3 # SHARED_V8_LIB_DIR is expected to be full absolute path if set by user |
| 4 ifeq ($(SHARED_V8_LIB_DIR),) | 4 ifeq ($(SHARED_V8_LIB_DIR),) |
| 5 # default | 5 # default |
| 6 SHARED_V8_LIB_DIR := ./libadblockplus-binaries | 6 SHARED_V8_LIB_DIR := ./libadblockplus-binaries |
| 7 SHARED_V8_INCLUDE_DIR := jni/libadblockplus-binaries/include/ | 7 SHARED_V8_INCLUDE_DIR := jni/libadblockplus-binaries/include/ |
| 8 else | 8 else |
| 9 # set by user | 9 # set by user |
| 10 $(info [Configuration] Using shared v8 libraries directory $(SHARED_V8_LIB_DIR )) | 10 $(info [Configuration] Using shared v8 libraries directory $(SHARED_V8_LIB_DIR )) |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 99 LOCAL_SRC_FILES += JniPlatform.cpp | 99 LOCAL_SRC_FILES += JniPlatform.cpp |
| 100 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp | 100 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp |
| 101 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp | 101 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp |
| 102 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp | 102 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp |
| 103 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp | 103 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp |
| 104 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp | 104 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp |
| 105 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp | 105 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp |
| 106 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp | 106 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp |
| 107 | 107 |
| 108 LOCAL_CPP_FEATURES := exceptions | 108 LOCAL_CPP_FEATURES := exceptions |
| 109 LOCAL_CPPFLAGS += -std=c++11 | |
| 110 | 109 |
| 111 LOCAL_C_INCLUDES := $(SHARED_V8_INCLUDE_DIR) | 110 LOCAL_C_INCLUDES := $(SHARED_V8_INCLUDE_DIR) |
| 112 | 111 |
| 112 LOCAL_LDFLAGS += -Wl,--allow-multiple-definition | |
| 113 LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true | |
| 114 | |
| 113 LOCAL_STATIC_LIBRARIES := libadblockplus v8-libplatform | 115 LOCAL_STATIC_LIBRARIES := libadblockplus v8-libplatform |
| 114 | 116 |
| 115 ifeq ($(SHARED_V8_LIB_FILENAMES),) | 117 ifeq ($(SHARED_V8_LIB_FILENAMES),) |
| 116 # static | 118 # static |
| 117 LOCAL_STATIC_LIBRARIES += v8-base v8-snapshot v8-libsampler v8-libbase | 119 LOCAL_STATIC_LIBRARIES += v8-base v8-snapshot v8-libsampler v8-libbase |
| 118 else | 120 else |
| 119 # dynamic | 121 # dynamic |
| 120 LOCAL_STATIC_LIBRARIES += $(SHARED_V8_LIB_FILENAMES) | 122 LOCAL_STATIC_LIBRARIES += $(SHARED_V8_LIB_FILENAMES) |
| 121 endif | 123 endif |
| 122 | 124 |
| 123 include $(BUILD_SHARED_LIBRARY) | 125 include $(BUILD_SHARED_LIBRARY) |
| OLD | NEW |
« no previous file with comments
|
« libadblockplus-android/build.gradle ('k')
|
libadblockplus-android/jni/Application.mk » ('j')
|
no next file with comments »
