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

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

Issue 29557565: Issue 5800 - Add option to specify a list of V8 libraries (Closed)
Left Patch Set: Created Sept. 27, 2017, 9:10 a.m.
Right Patch Set: moved 'packagingOptions' section to dynamic linking 'if' branch only Created Nov. 2, 2017, 11:30 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« libadblockplus-android/build.gradle ('K') | « libadblockplus-android/build.gradle ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 LOCAL_PATH := $(call my-dir) 1 LOCAL_PATH := $(call my-dir)
2 2
3 # Report configuration 3 # Report configuration
4 ifeq ($(SHARED_V8_LIB_FILENAME),) 4 ifeq ($(SHARED_V8_LIB_FILENAMES),)
5 # static 5 # static
6 $(info [Configuration] Linking statically with built-in v8) 6 $(info [Configuration] Linking statically with built-in v8)
7 else 7 else
8 # dynamic 8 # dynamic
9 $(info [Configuration] Linking dynamically with shared v8 library ./libadblockpl us-binaries/android_$(TARGET_ARCH_ABI)/$(SHARED_V8_LIB_FILENAME)) 9
10 define info_define
11 $(info [Configuration] Linking dynamically with shared v8 library ./libadblo ckplus-binaries/android_$(TARGET_ARCH_ABI)/$1)
12 endef
13 $(foreach item,$(SHARED_V8_LIB_FILENAMES),$(eval $(call info_define,$(item))))
10 endif 14 endif
11 15
12 # libadblockplus.a 16 # libadblockplus.a
13 include $(CLEAR_VARS) 17 include $(CLEAR_VARS)
14 18
15 LOCAL_MODULE := libadblockplus 19 LOCAL_MODULE := libadblockplus
16 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libadblo ckplus.a 20 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libadblo ckplus.a
17 21
18 include $(PREBUILT_STATIC_LIBRARY) 22 include $(PREBUILT_STATIC_LIBRARY)
19 23
20 # libv8-platform.a 24 # libv8-platform.a
21 include $(CLEAR_VARS) 25 include $(CLEAR_VARS)
22 26
23 LOCAL_MODULE := v8-libplatform 27 LOCAL_MODULE := v8-libplatform
24 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bplatform.a 28 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bplatform.a
25 29
26 include $(PREBUILT_STATIC_LIBRARY) 30 include $(PREBUILT_STATIC_LIBRARY)
27 31
28 ifeq ($(SHARED_V8_LIB_FILENAME),) 32 ifeq ($(SHARED_V8_LIB_FILENAMES),)
29 # static 33 # static
30 34
31 # libv8-libsampler.a 35 # libv8-libsampler.a
32 include $(CLEAR_VARS) 36 include $(CLEAR_VARS)
33 37
34 LOCAL_MODULE := v8-libsampler 38 LOCAL_MODULE := v8-libsampler
35 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bsampler.a 39 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_li bsampler.a
36 40
37 include $(PREBUILT_STATIC_LIBRARY) 41 include $(PREBUILT_STATIC_LIBRARY)
38 42
(...skipping 17 matching lines...) Expand all
56 include $(CLEAR_VARS) 60 include $(CLEAR_VARS)
57 61
58 LOCAL_MODULE := v8-snapshot 62 LOCAL_MODULE := v8-snapshot
59 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_sn apshot.a 63 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/libv8_sn apshot.a
60 64
61 include $(PREBUILT_STATIC_LIBRARY) 65 include $(PREBUILT_STATIC_LIBRARY)
62 66
63 else 67 else
64 # dynamic 68 # dynamic
65 69
66 # prebuilt shared library v8 70 # prebuilt shared libraries v8
67 include $(CLEAR_VARS)
68 71
69 LOCAL_MODULE := libv8 72 define libv8_define
70 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/$(SHARED _V8_LIB_FILENAME) 73 include $(CLEAR_VARS)
71 include $(PREBUILT_SHARED_LIBRARY) 74
75 LOCAL_MODULE := $1
76 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/$1
77
78 include $(PREBUILT_SHARED_LIBRARY)
79 endef
80 $(foreach item,$(SHARED_V8_LIB_FILENAMES),$(eval $(call libv8_define,$(item))))
72 81
73 endif 82 endif
74 83
75 include $(CLEAR_VARS) 84 include $(CLEAR_VARS)
76 85
77 LOCAL_MODULE := libadblockplus-jni 86 LOCAL_MODULE := libadblockplus-jni
78 LOCAL_SRC_FILES := JniLibrary.cpp 87 LOCAL_SRC_FILES := JniLibrary.cpp
79 LOCAL_SRC_FILES += JniPlatform.cpp 88 LOCAL_SRC_FILES += JniPlatform.cpp
80 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp 89 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp
81 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp 90 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp
82 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp 91 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp
83 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp 92 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp
84 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp 93 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp
85 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp 94 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp
86 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp 95 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp
87 96
88 LOCAL_CPP_FEATURES := exceptions 97 LOCAL_CPP_FEATURES := exceptions
89 LOCAL_CPPFLAGS += -std=c++11 98 LOCAL_CPPFLAGS += -std=c++11
90 99
91 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/ 100 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/
92 101
93 LOCAL_STATIC_LIBRARIES := libadblockplus v8-libplatform 102 LOCAL_STATIC_LIBRARIES := libadblockplus v8-libplatform
94 103
95 ifeq ($(SHARED_V8_LIB_FILENAME),) 104 ifeq ($(SHARED_V8_LIB_FILENAMES),)
96 # static 105 # static
97 LOCAL_STATIC_LIBRARIES += v8-base v8-snapshot v8-libsampler v8-libbase 106 LOCAL_STATIC_LIBRARIES += v8-base v8-snapshot v8-libsampler v8-libbase
98 else 107 else
99 # dynamic 108 # dynamic
100 LOCAL_STATIC_LIBRARIES += libv8 109 LOCAL_STATIC_LIBRARIES += $(SHARED_V8_LIB_FILENAMES)
101 endif 110 endif
102 111
103 include $(BUILD_SHARED_LIBRARY) 112 include $(BUILD_SHARED_LIBRARY)
LEFTRIGHT
« libadblockplus-android/build.gradle ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld