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

Side by Side Diff: jni/Android.mk

Issue 5153282527854592: Issue 98 - Use the libadblockplus update mechanism (Closed)
Patch Set: Created Sept. 25, 2014, 3:57 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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_arm/libadblockplus.a 6 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libadblockplus.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_arm/libv8_base.a 13 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_base.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_arm/libv8_snapshot.a 20 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_arm/libv8_snapshot.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 JniFilter. cpp 27 LOCAL_SRC_FILES := JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp
Felix Dahlke 2014/09/25 16:01:12 Changed a bit more than necessary here - I wanted
28 LOCAL_SRC_FILES += JniSubscription.cpp JniEventCallback.cpp JniLogSystem.cpp 28 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp
29 LOCAL_SRC_FILES += JniWebRequest.cpp JniUpdateCheckDoneCallback.cpp 29 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp
30 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp
30 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp 31 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp
31 32
32 LOCAL_CPP_FEATURES := exceptions 33 LOCAL_CPP_FEATURES := exceptions
33 LOCAL_CFLAGS += -std=gnu++0x 34 LOCAL_CFLAGS += -std=gnu++0x
34 35
35 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/ 36 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/
36 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot 37 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot
37 38
38 include $(BUILD_SHARED_LIBRARY) 39 include $(BUILD_SHARED_LIBRARY)
OLDNEW
« no previous file with comments | « AndroidManifest.xml ('k') | jni/JniCallbacks.h » ('j') | res/values/strings.xml » ('J')

Powered by Google App Engine
This is Rietveld