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

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

Issue 29810565: Issue 6750 - Update libadblockplus dependency to revision hg:70579fb48a6c (Closed)
Left Patch Set: Supporting multiple shared V8 libraries. Created June 20, 2018, 3:54 p.m.
Right Patch Set: Updated revisions, README Created June 21, 2018, 1:34 p.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
« no previous file with change/comment | « dependencies ('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 # 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
11 # headers: LIBABP_INCLUDE_DIR 11 # headers: LIBABP_INCLUDE_DIR
12 # binaries: 12 # binaries:
13 # LIBABP_LIB_DIR (libadblockplus.a) 13 # LIBABP_LIB_DIR (libadblockplus.a)
14 14
15 # libadblockplus 15 # libadblockplus
16 # --- 16 # ---
17 17
18 # headers 18 # headers
19 19
20 # default 20 # default
21 ifeq ($(LIBABP_INCLUDE_DIR),) 21 ifeq ($(LIBABP_INCLUDE_DIR),)
22 LIBABP_INCLUDE_DIR := $(PWD)/../libadblockplus/include 22 LIBABP_INCLUDE_DIR := $(PWD)/../libadblockplus/include
23 $(info [Configuration] Pass LIBABP_INCLUDE_DIR to set libadblockplus headers d irectory, using default value.) 23 $(info [Configuration] Pass LIBABP_INCLUDE_DIR to set libadblockplus headers d irectory, using default value.)
24 endif 24 endif
25 25
26 $(info [Configuration] Using libadblockplus headers directory $(LIBABP_INCLUDE_D IR)) 26 $(info [Configuration] Using libadblockplus headers directory $(LIBABP_INCLUDE_D IR))
27 GLOBAL_C_INCLUDES := $(LIBABP_INCLUDE_DIR) 27 TMP_C_INCLUDES := $(LIBABP_INCLUDE_DIR)
28 28
29 # binaries 29 # binaries
30 30
31 ifeq ($(LIBABP_LIB_DIR),) 31 ifeq ($(LIBABP_LIB_DIR),)
32 LIBABP_LIB_DIR := $(PWD)/../libadblockplus/build/local/$(TARGET_ARCH_ABI) 32 LIBABP_LIB_DIR := $(PWD)/../libadblockplus/build/local/$(TARGET_ARCH_ABI)
33 $(info [Configuration] Pass LIBABP_LIB_DIR to set static libadblockplus librar y directory, using default value.) 33 $(info [Configuration] Pass LIBABP_LIB_DIR to set static libadblockplus librar y directory, using default value.)
34 endif 34 endif
35 35
36 $(info [Configuration] Using static libadblockplus library $(LIBABP_LIB_DIR)/lib adblockplus.a) 36 $(info [Configuration] Using static libadblockplus library $(LIBABP_LIB_DIR)/lib adblockplus.a)
37 37
38 include $(CLEAR_VARS) 38 include $(CLEAR_VARS)
39 LOCAL_MODULE := libadblockplus 39 LOCAL_MODULE := libadblockplus
40 LOCAL_SRC_FILES := $(LIBABP_LIB_DIR)/libadblockplus.a 40 LOCAL_SRC_FILES := $(LIBABP_LIB_DIR)/libadblockplus.a
41 include $(PREBUILT_STATIC_LIBRARY) 41 include $(PREBUILT_STATIC_LIBRARY)
42 GLOBAL_STATIC_LIBRARIES += libadblockplus 42 TMP_LIBRARIES += libadblockplus
43 # --- 43 # ---
44 44
45 # V8 45 # V8
46 # --- 46 # ---
47 47
48 # headers 48 # headers
49 49
50 # default 50 # default
51 ifeq ($(V8_INCLUDE_DIR),) 51 ifeq ($(V8_INCLUDE_DIR),)
52 V8_INCLUDE_DIR := $(PWD)/../libadblockplus/third_party/prebuilt-v8/include 52 V8_INCLUDE_DIR := $(PWD)/../libadblockplus/third_party/prebuilt-v8/include
53 $(info [Configuration] Pass V8_INCLUDE_DIR to set V8 headers directory, using default value.) 53 $(info [Configuration] Pass V8_INCLUDE_DIR to set V8 headers directory, using default value.)
54 endif 54 endif
55 55
56 $(info [Configuration] Using V8 headers directory $(V8_INCLUDE_DIR)) 56 $(info [Configuration] Using V8 headers directory $(V8_INCLUDE_DIR))
57 GLOBAL_C_INCLUDES += $(V8_INCLUDE_DIR) 57 TMP_C_INCLUDES += $(V8_INCLUDE_DIR)
58 58
59 # binaries 59 # binaries
60 ifeq ($(SHARED_V8_LIB_DIR),) 60 ifeq ($(SHARED_V8_LIB_DIR),)
61 61
62 # default 62 # default
63 ifeq ($(STATIC_V8_LIB_DIR),) 63 ifeq ($(STATIC_V8_LIB_DIR),)
64 STATIC_V8_LIB_DIR := $(PWD)/../libadblockplus/third_party/prebuilt-v8 64 STATIC_V8_LIB_DIR := $(PWD)/../libadblockplus/third_party/prebuilt-v8
65 $(info [Configuration] Pass STATIC_V8_LIB_DIR to set static V8 libraries dir ectory, using default value.) 65 $(info [Configuration] Pass STATIC_V8_LIB_DIR to set static V8 libraries dir ectory, using default value.)
66 endif 66 endif
67 67
68 $(info [Configuration] Using static v8 library $(STATIC_V8_LIB_DIR)/libv8_mono lith.a) 68 $(info [Configuration] Using static v8 library $(STATIC_V8_LIB_DIR)/libv8_mono lith.a)
69 69
70 include $(CLEAR_VARS) 70 include $(CLEAR_VARS)
71 LOCAL_MODULE := libv8_monolith 71 LOCAL_MODULE := libv8_monolith
72 LOCAL_SRC_FILES := $(STATIC_V8_LIB_DIR)/libv8_monolith.a 72 LOCAL_SRC_FILES := $(STATIC_V8_LIB_DIR)/libv8_monolith.a
73 include $(PREBUILT_STATIC_LIBRARY) 73 include $(PREBUILT_STATIC_LIBRARY)
74 GLOBAL_STATIC_LIBRARIES += libv8_monolith 74 TMP_LIBRARIES += libv8_monolith
75 75
76 else 76 else
77 77
78 define libv8_define 78 define libv8_define
79 include $(CLEAR_VARS) 79 include $(CLEAR_VARS)
80 $(info [Configuration] Linking dynamically with shared v8 library $(SHARED _V8_LIB_DIR)/$1) 80 $(info [Configuration] Linking dynamically with shared v8 library $(SHARED _V8_LIB_DIR)/$1)
81 LOCAL_MODULE := $1 81 LOCAL_MODULE := $1
82 LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIR)/$1 82 LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIR)/$1
83 include $(PREBUILT_SHARED_LIBRARY) 83 include $(PREBUILT_SHARED_LIBRARY)
84 GLOBAL_STATIC_LIBRARIES += $1 84 TMP_LIBRARIES += $1
85 endef 85 endef
86 $(foreach item,$(SHARED_V8_LIB_FILENAMES),$(eval $(call libv8_define,$(item))) ) 86 $(foreach item,$(SHARED_V8_LIB_FILENAMES),$(eval $(call libv8_define,$(item))) )
87 87
88 endif 88 endif
89 # ---- 89 # ----
90 90
91 include $(CLEAR_VARS) 91 include $(CLEAR_VARS)
92 92
93 LOCAL_MODULE := libadblockplus-jni 93 LOCAL_MODULE := libadblockplus-jni
94 LOCAL_SRC_FILES := JniLibrary.cpp 94 LOCAL_SRC_FILES := JniLibrary.cpp
95 LOCAL_SRC_FILES += JniPlatform.cpp 95 LOCAL_SRC_FILES += JniPlatform.cpp
96 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp 96 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp
97 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp 97 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp
98 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp 98 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp
99 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp 99 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp
100 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp 100 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp
101 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp 101 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp
102 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp 102 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp
103 103
104 LOCAL_CPP_FEATURES := exceptions 104 LOCAL_CPP_FEATURES := exceptions
105 105
106 LOCAL_LDFLAGS += -Wl,--allow-multiple-definition 106 LOCAL_LDFLAGS += -Wl,--allow-multiple-definition
107 LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true 107 LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
108 108
109 LOCAL_STATIC_LIBRARIES := $(GLOBAL_STATIC_LIBRARIES) 109 # TMP_ variables are used to collect include paths for LOCAL_C_INCLUDES
110 LOCAL_C_INCLUDES := $(GLOBAL_C_INCLUDES) 110 # and libs for LOCAL_STATIC_LIBRARIES because `include $(CLEAR_VARS)` clears the m otherwise
111 LOCAL_C_INCLUDES := $(TMP_C_INCLUDES)
112 LOCAL_STATIC_LIBRARIES := $(TMP_LIBRARIES)
111 113
112 include $(BUILD_SHARED_LIBRARY) 114 include $(BUILD_SHARED_LIBRARY)
LEFTRIGHT
« dependencies ('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