Delta Between Two Patch Sets: adblock-android/jni/Android.mk
Issue 29908555:
Issue 7035 - Update libadblockplus dependency (Closed)
Base URL: git@github.com:adblockplus/libadblockplus-android.git@d150f08d5d72de8938c7ebbdccd9b0c4e06b4070
Left Patch Set:
Created Oct. 12, 2018, 9:13 a.m.
Right Patch Set: Issue 7035 - Update libadblockplus dependency
Created Oct. 16, 2018, 3:17 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdaterTest.java ('k')
|
adblock-android/jni/JniFilterEngine.cpp » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 1 LOCAL_PATH := $(call my-dir) | 1 LOCAL_PATH := $(call my-dir) |
| 2 | 2 |
| 3 # Use cases: | 3 # Use cases: |
| 4 # ---------- | 4 # ---------- |
| 5 # V8 - static/dynamic | 5 # V8 - static/dynamic |
| 6 # headers: V8_INCLUDE_DIR | 6 # headers: V8_INCLUDE_DIR |
| 7 # binaries: | 7 # binaries: |
| 8 # static: STATIC_V8_LIB_DIR (libv8_monolith.a) | 8 # static: STATIC_V8_LIB_DIR (libv8_monolith.a) |
| 9 # dynamic: SHARED_V8_LIB_DIR (libv8.cr.so, libv8_libbase.cr.so) | 9 # dynamic: SHARED_V8_LIB_DIR (libv8.cr.so, libv8_libbase.cr.so) |
| 10 # libadblockplus - static | 10 # libadblockplus - static |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 96 # ---- | 96 # ---- |
| 97 | 97 |
| 98 include $(CLEAR_VARS) | 98 include $(CLEAR_VARS) |
| 99 | 99 |
| 100 LOCAL_MODULE := libadblockplus-jni | 100 LOCAL_MODULE := libadblockplus-jni |
| 101 LOCAL_SRC_FILES := JniLibrary.cpp | 101 LOCAL_SRC_FILES := JniLibrary.cpp |
| 102 LOCAL_SRC_FILES += JniPlatform.cpp | 102 LOCAL_SRC_FILES += JniPlatform.cpp |
| 103 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp | 103 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp |
| 104 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp | 104 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp |
| 105 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp | 105 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp |
| 106 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp | |
| 107 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp | 106 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp |
| 108 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp | 107 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp |
| 109 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp | 108 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp |
| 110 | 109 |
| 111 LOCAL_CPP_FEATURES := exceptions | 110 LOCAL_CPP_FEATURES := exceptions |
| 112 | 111 |
| 113 LOCAL_LDFLAGS += -Wl,--allow-multiple-definition | 112 LOCAL_LDFLAGS += -Wl,--allow-multiple-definition |
| 114 LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true | 113 LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true |
| 115 | 114 |
| 116 # TMP_ variables are used to collect include paths for LOCAL_C_INCLUDES | 115 # TMP_ variables are used to collect include paths for LOCAL_C_INCLUDES |
| 117 # and libs for LOCAL_STATIC_LIBRARIES because `include $(CLEAR_VARS)` clears the m otherwise | 116 # and libs for LOCAL_STATIC_LIBRARIES because `include $(CLEAR_VARS)` clears the m otherwise |
| 118 LOCAL_C_INCLUDES := $(TMP_C_INCLUDES) | 117 LOCAL_C_INCLUDES := $(TMP_C_INCLUDES) |
| 119 LOCAL_STATIC_LIBRARIES := $(TMP_LIBRARIES) | 118 LOCAL_STATIC_LIBRARIES := $(TMP_LIBRARIES) |
| 120 | 119 |
| 121 include $(BUILD_SHARED_LIBRARY) | 120 include $(BUILD_SHARED_LIBRARY) |
| LEFT | RIGHT |
« adblock-android-tests/src/org/adblockplus/libadblockplus/tests/UpdaterTest.java ('k')
|
adblock-android/jni/JniFilterEngine.cpp » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
