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: Renamed env. variable Created Sept. 29, 2017, 8:27 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_FILENAMES),) 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 9
10 SHARED_V8_LIB_FILENAMES_LIST = $(subst :, ,$(SHARED_V8_LIB_FILENAMES))
11 define info_define 10 define info_define
12 $(info [Configuration] Linking dynamically with shared v8 library ./libadblo ckplus-binaries/android_$(TARGET_ARCH_ABI)/$1) 11 $(info [Configuration] Linking dynamically with shared v8 library ./libadblo ckplus-binaries/android_$(TARGET_ARCH_ABI)/$1)
13 endef 12 endef
14 $(foreach item,$(SHARED_V8_LIB_FILENAMES_LIST),$(eval $(call info_define,$(item) ))) 13 $(foreach item,$(SHARED_V8_LIB_FILENAMES),$(eval $(call info_define,$(item))))
15 endif 14 endif
16 15
17 # libadblockplus.a 16 # libadblockplus.a
18 include $(CLEAR_VARS) 17 include $(CLEAR_VARS)
19 18
20 LOCAL_MODULE := libadblockplus 19 LOCAL_MODULE := libadblockplus
21 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
22 21
23 include $(PREBUILT_STATIC_LIBRARY) 22 include $(PREBUILT_STATIC_LIBRARY)
24 23
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 LOCAL_MODULE := v8-snapshot 62 LOCAL_MODULE := v8-snapshot
64 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
65 64
66 include $(PREBUILT_STATIC_LIBRARY) 65 include $(PREBUILT_STATIC_LIBRARY)
67 66
68 else 67 else
69 # dynamic 68 # dynamic
70 69
71 # prebuilt shared libraries v8 70 # prebuilt shared libraries v8
72 71
73 SHARED_V8_LIB_FILENAMES_LIST = $(subst :, ,$(SHARED_V8_LIB_FILENAMES))
74 define libv8_define 72 define libv8_define
75 include $(CLEAR_VARS) 73 include $(CLEAR_VARS)
76 74
77 LOCAL_MODULE := $1 75 LOCAL_MODULE := $1
78 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/$1 76 LOCAL_SRC_FILES := ./libadblockplus-binaries/android_$(TARGET_ARCH_ABI)/$1
79 77
80 include $(PREBUILT_SHARED_LIBRARY) 78 include $(PREBUILT_SHARED_LIBRARY)
81 endef 79 endef
82 $(foreach item,$(SHARED_V8_LIB_FILENAMES_LIST),$(eval $(call libv8_define,$(item )))) 80 $(foreach item,$(SHARED_V8_LIB_FILENAMES),$(eval $(call libv8_define,$(item))))
83 81
84 endif 82 endif
85 83
86 include $(CLEAR_VARS) 84 include $(CLEAR_VARS)
87 85
88 LOCAL_MODULE := libadblockplus-jni 86 LOCAL_MODULE := libadblockplus-jni
89 LOCAL_SRC_FILES := JniLibrary.cpp 87 LOCAL_SRC_FILES := JniLibrary.cpp
90 LOCAL_SRC_FILES += JniPlatform.cpp 88 LOCAL_SRC_FILES += JniPlatform.cpp
91 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp 89 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp
92 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp 90 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp
93 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp 91 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp
94 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp 92 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp
95 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp 93 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp
96 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp 94 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp
97 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp 95 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp
98 96
99 LOCAL_CPP_FEATURES := exceptions 97 LOCAL_CPP_FEATURES := exceptions
100 LOCAL_CPPFLAGS += -std=c++11 98 LOCAL_CPPFLAGS += -std=c++11
101 99
102 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/ 100 LOCAL_C_INCLUDES := jni/libadblockplus-binaries/include/
103 101
104 LOCAL_STATIC_LIBRARIES := libadblockplus v8-libplatform 102 LOCAL_STATIC_LIBRARIES := libadblockplus v8-libplatform
105 103
106 ifeq ($(SHARED_V8_LIB_FILENAMES),) 104 ifeq ($(SHARED_V8_LIB_FILENAMES),)
107 # static 105 # static
108 LOCAL_STATIC_LIBRARIES += v8-base v8-snapshot v8-libsampler v8-libbase 106 LOCAL_STATIC_LIBRARIES += v8-base v8-snapshot v8-libsampler v8-libbase
109 else 107 else
110 # dynamic 108 # dynamic
111 SHARED_V8_LIB_FILENAMES_LIST = $(subst :, ,$(SHARED_V8_LIB_FILENAMES)) 109 LOCAL_STATIC_LIBRARIES += $(SHARED_V8_LIB_FILENAMES)
112 LOCAL_STATIC_LIBRARIES += $(SHARED_V8_LIB_FILENAMES_LIST)
113 endif 110 endif
114 111
115 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