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

Delta Between Two Patch Sets: libadblockplus-android/jni/Android.mk

Issue 29347315: Issue 4231 - Fix unstable FilterEngineTest.testSetRemoveFilterChangeCallback (Closed)
Left Patch Set: Created July 7, 2016, 10:22 a.m.
Right Patch Set: made helper methods static, fixed 'remove' for fs callback Created Dec. 13, 2016, 9:32 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
LEFTRIGHT
(no file at all)
1 LOCAL_PATH := $(call my-dir) 1 LOCAL_PATH := $(call my-dir)
2 2
3 include $(CLEAR_VARS) 3 include $(CLEAR_VARS)
4 4
5 LOCAL_MODULE := libadblockplus 5 LOCAL_MODULE := libadblockplus
6 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libadblo ckplus.a 6 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libadblo ckplus.a
7 7
8 include $(PREBUILT_STATIC_LIBRARY) 8 include $(PREBUILT_STATIC_LIBRARY)
9 9
10 include $(CLEAR_VARS) 10 include $(CLEAR_VARS)
11 11
12 LOCAL_MODULE := v8-base 12 LOCAL_MODULE := v8-base
13 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_ba se.a 13 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_ba se.a
14 14
15 include $(PREBUILT_STATIC_LIBRARY) 15 include $(PREBUILT_STATIC_LIBRARY)
16 16
17 include $(CLEAR_VARS) 17 include $(CLEAR_VARS)
18 18
19 LOCAL_MODULE := v8-snapshot 19 LOCAL_MODULE := v8-snapshot
20 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_sn apshot.a 20 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_sn apshot.a
21 21
22 include $(PREBUILT_STATIC_LIBRARY) 22 include $(PREBUILT_STATIC_LIBRARY)
23 23
24 include $(CLEAR_VARS) 24 include $(CLEAR_VARS)
25 25
26 LOCAL_MODULE := libadblockplus-jni 26 LOCAL_MODULE := libadblockplus-jni
27 LOCAL_SRC_FILES := JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp 27 LOCAL_SRC_FILES := JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp
28 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp 28 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp
29 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp 29 LOCAL_SRC_FILES += JniLogSystem.cpp JniFileSystem.cpp JniWebRequest.cpp
30 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp 30 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp
31 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp 31 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp
32 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp 32 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp
33 33
34 LOCAL_CPP_FEATURES := exceptions 34 LOCAL_CPP_FEATURES := exceptions
35 LOCAL_CPPFLAGS += -std=c++11 35 LOCAL_CPPFLAGS += -std=c++11
36 36
37 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/ 37 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/
38 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot 38 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot
39 39
40 include $(BUILD_SHARED_LIBRARY) 40 include $(BUILD_SHARED_LIBRARY)
LEFTRIGHT

Powered by Google App Engine
This is Rietveld