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

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

Issue 29812630: Issue 6750 - Update libadblockplus dependency to revision hg:4f6413dbcf2e (Closed)
Left Patch Set: Created June 21, 2018, 6:17 p.m.
Right Patch Set: addressed Sergey comments. Created June 22, 2018, 11:18 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
« no previous file with change/comment | « adblock-android/build.gradle ('k') | dependencies » ('j') | 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
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 TMP_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
65 ifeq ($(APP_ABI),armeabi-v7a)
66 ABP_TARGET_ARCH := arm
67 else
68 ABP_TARGET_ARCH := ia32
69 endif
70
71 STATIC_V8_LIB_DIR := $(PWD)/../libadblockplus/third_party/prebuilt-v8/androi d-$(ABP_TARGET_ARCH)-release
65 $(info [Configuration] Pass STATIC_V8_LIB_DIR to set static V8 libraries dir ectory, using default value.) 72 $(info [Configuration] Pass STATIC_V8_LIB_DIR to set static V8 libraries dir ectory, using default value.)
66 endif 73 endif
67 74
68 $(info [Configuration] Using static v8 library $(STATIC_V8_LIB_DIR)/libv8_mono lith.a) 75 $(info [Configuration] Using static v8 library $(STATIC_V8_LIB_DIR)/libv8_mono lith.a)
69 76
70 include $(CLEAR_VARS) 77 include $(CLEAR_VARS)
71 LOCAL_MODULE := libv8_monolith 78 LOCAL_MODULE := libv8_monolith
72 LOCAL_SRC_FILES := $(STATIC_V8_LIB_DIR)/libv8_monolith.a 79 LOCAL_SRC_FILES := $(STATIC_V8_LIB_DIR)/libv8_monolith.a
73 include $(PREBUILT_STATIC_LIBRARY) 80 include $(PREBUILT_STATIC_LIBRARY)
74 TMP_LIBRARIES += libv8_monolith 81 TMP_LIBRARIES += libv8_monolith
(...skipping 30 matching lines...) Expand all
105 112
106 LOCAL_LDFLAGS += -Wl,--allow-multiple-definition 113 LOCAL_LDFLAGS += -Wl,--allow-multiple-definition
107 LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true 114 LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
108 115
109 # TMP_ variables are used to collect include paths for LOCAL_C_INCLUDES 116 # TMP_ variables are used to collect include paths for LOCAL_C_INCLUDES
110 # and libs for LOCAL_STATIC_LIBRARIES because `include $(CLEAR_VARS)` clears the m otherwise 117 # and libs for LOCAL_STATIC_LIBRARIES because `include $(CLEAR_VARS)` clears the m otherwise
111 LOCAL_C_INCLUDES := $(TMP_C_INCLUDES) 118 LOCAL_C_INCLUDES := $(TMP_C_INCLUDES)
112 LOCAL_STATIC_LIBRARIES := $(TMP_LIBRARIES) 119 LOCAL_STATIC_LIBRARIES := $(TMP_LIBRARIES)
113 120
114 include $(BUILD_SHARED_LIBRARY) 121 include $(BUILD_SHARED_LIBRARY)
LEFTRIGHT
« adblock-android/build.gradle ('k') | dependencies » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld