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

Side by Side Diff: libadblockplus-android/jni/Android.mk

Issue 29557565: Issue 5800 - Add option to specify a list of V8 libraries (Closed)
Patch Set: Created Sept. 27, 2017, 9:10 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « README.md ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 LOCAL_PATH := $(call my-dir) 1 LOCAL_PATH := $(call my-dir)
2 2
3 # Report configuration
4 ifeq ($(SHARED_V8_LIB_FILENAME),)
5 # static
6 $(info [Configuration] Linking statically with built-in v8)
7 else
8 # dynamic
9 $(info [Configuration] Linking dynamically with shared v8 library ./libadblockpl us-binaries/android_$(TARGET_ARCH_ABI)/$(SHARED_V8_LIB_FILENAME))
10 endif
11
12 # libadblockplus.a
3 include $(CLEAR_VARS) 13 include $(CLEAR_VARS)
4 14
5 LOCAL_MODULE := libadblockplus 15 LOCAL_MODULE := libadblockplus
6 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libadblo ckplus.a 16 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libadblo ckplus.a
7 17
8 include $(PREBUILT_STATIC_LIBRARY) 18 include $(PREBUILT_STATIC_LIBRARY)
9 19
20 # libv8-platform.a
21 include $(CLEAR_VARS)
22
23 LOCAL_MODULE := v8-libplatform
24 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bplatform.a
25
26 include $(PREBUILT_STATIC_LIBRARY)
27
28 ifeq ($(SHARED_V8_LIB_FILENAME),)
29 # static
30
31 # libv8-libsampler.a
10 include $(CLEAR_VARS) 32 include $(CLEAR_VARS)
11 33
12 LOCAL_MODULE := v8-libsampler 34 LOCAL_MODULE := v8-libsampler
13 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bsampler.a 35 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bsampler.a
14 36
15 include $(PREBUILT_STATIC_LIBRARY) 37 include $(PREBUILT_STATIC_LIBRARY)
16 38
39 # libv8-base.a
17 include $(CLEAR_VARS) 40 include $(CLEAR_VARS)
18 41
19 LOCAL_MODULE := v8-base 42 LOCAL_MODULE := v8-base
20 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_ba se.a 43 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_ba se.a
21 44
22 include $(PREBUILT_STATIC_LIBRARY) 45 include $(PREBUILT_STATIC_LIBRARY)
23 46
47 # libv8_libbase.a
24 include $(CLEAR_VARS) 48 include $(CLEAR_VARS)
25 49
26 LOCAL_MODULE := v8-libbase 50 LOCAL_MODULE := v8-libbase
27 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bbase.a 51 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bbase.a
28 52
29 include $(PREBUILT_STATIC_LIBRARY) 53 include $(PREBUILT_STATIC_LIBRARY)
30 54
31 include $(CLEAR_VARS) 55 # libv8_snapshot.a
32
33 LOCAL_MODULE := v8-libplatform
34 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bplatform.a
35
36 include $(PREBUILT_STATIC_LIBRARY)
37
38 include $(CLEAR_VARS) 56 include $(CLEAR_VARS)
39 57
40 LOCAL_MODULE := v8-snapshot 58 LOCAL_MODULE := v8-snapshot
41 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_sn apshot.a 59 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_sn apshot.a
42 60
43 include $(PREBUILT_STATIC_LIBRARY) 61 include $(PREBUILT_STATIC_LIBRARY)
44 62
63 else
64 # dynamic
65
66 # prebuilt shared library v8
45 include $(CLEAR_VARS) 67 include $(CLEAR_VARS)
46 68
69 LOCAL_MODULE := libv8
70 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/$(SHARED _V8_LIB_FILENAME)
71 include $(PREBUILT_SHARED_LIBRARY)
72
73 endif
74
75 include $(CLEAR_VARS)
76
47 LOCAL_MODULE := libadblockplus-jni 77 LOCAL_MODULE := libadblockplus-jni
48 LOCAL_SRC_FILES := JniLibrary.cpp 78 LOCAL_SRC_FILES := JniLibrary.cpp
49 LOCAL_SRC_FILES += JniPlatform.cpp 79 LOCAL_SRC_FILES += JniPlatform.cpp
50 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp 80 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp
51 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp 81 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp
52 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp 82 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp
53 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp 83 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp
54 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp 84 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp
55 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp 85 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp
56 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp 86 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp
57 87
58 LOCAL_CPP_FEATURES := exceptions 88 LOCAL_CPP_FEATURES := exceptions
59 LOCAL_CPPFLAGS += -std=c++11 89 LOCAL_CPPFLAGS += -std=c++11
60 90
61 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/ 91 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/
62 LOCAL_STATIC_LIBRARIES := libadblockplus v8-base v8-snapshot v8-libsampler v8-li bplatform v8-libbase 92
93 LOCAL_STATIC_LIBRARIES := libadblockplus v8-libplatform
94
95 ifeq ($(SHARED_V8_LIB_FILENAME),)
96 # static
97 LOCAL_STATIC_LIBRARIES += v8-base v8-snapshot v8-libsampler v8-libbase
98 else
99 # dynamic
100 LOCAL_STATIC_LIBRARIES += libv8
101 endif
63 102
64 include $(BUILD_SHARED_LIBRARY) 103 include $(BUILD_SHARED_LIBRARY)
OLDNEW
« no previous file with comments | « README.md ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld