Issue 6214 - Configure libadblockplus binaries directory

libadblockplus-android/jni/Android.mk

 LOCAL_PATH := $(call my-dir)
 
-# SHARED_V8_LIB_DIRECTORY is expected to be full absolute path if set by user

[diegocarloslima, 2018/01/03 11:49:29]

I wouldn't insist, but maybe it might be better to rename this var to
`SHARED_V8_LIB_DIR` just to be a little bit more concise

-ifeq ($(SHARED_V8_LIB_DIRECTORY),)
+# SHARED_V8_LIB_DIR is expected to be full absolute path if set by user
+ifeq ($(SHARED_V8_LIB_DIR),)
   # default
-  SHARED_V8_LIB_DIRECTORY := ./libadblockplus-binaries
-  SHARED_V8_INCLUDE_DIRECTORY := jni/libadblockplus-binaries/include/
+  SHARED_V8_LIB_DIR := ./libadblockplus-binaries
+  SHARED_V8_INCLUDE_DIR := jni/libadblockplus-binaries/include/
 else
   # set by user
-  $(info [Configuration] Using shared v8 libraries directory $(SHARED_V8_LIB_DIRECTORY))
-  SHARED_V8_INCLUDE_DIRECTORY := $(SHARED_V8_LIB_DIRECTORY)/include/
+  $(info [Configuration] Using shared v8 libraries directory $(SHARED_V8_LIB_DIR))
+  SHARED_V8_INCLUDE_DIR := $(SHARED_V8_LIB_DIR)/include/
 endif
 
 # Report configuration
 ifeq ($(SHARED_V8_LIB_FILENAMES),)
 # static
 $(info [Configuration] Linking statically with built-in v8)
 else
 # dynamic
 
 define info_define
-    $(info [Configuration] Linking dynamically with shared v8 library $(SHARED_V8_LIB_DIRECTORY)/android_$(TARGET_ARCH_ABI)/$1)
+    $(info [Configuration] Linking dynamically with shared v8 library $(SHARED_V8_LIB_DIR)/android_$(TARGET_ARCH_ABI)/$1)
 endef
 $(foreach item,$(SHARED_V8_LIB_FILENAMES),$(eval $(call info_define,$(item))))
 endif
 
 # libadblockplus.a
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libadblockplus
-LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIRECTORY)/android_$(TARGET_ARCH_ABI)/libadblockplus.a
+LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIR)/android_$(TARGET_ARCH_ABI)/libadblockplus.a
 
 include $(PREBUILT_STATIC_LIBRARY)
 
 # libv8-platform.a
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := v8-libplatform
-LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIRECTORY)/android_$(TARGET_ARCH_ABI)/libv8_libplatform.a
+LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIR)/android_$(TARGET_ARCH_ABI)/libv8_libplatform.a
 
 include $(PREBUILT_STATIC_LIBRARY)
 
 ifeq ($(SHARED_V8_LIB_FILENAMES),)
 # static
 
 # libv8-libsampler.a
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := v8-libsampler
-LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIRECTORY)/android_$(TARGET_ARCH_ABI)/libv8_libsampler.a
+LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIR)/android_$(TARGET_ARCH_ABI)/libv8_libsampler.a
 
 include $(PREBUILT_STATIC_LIBRARY)
 
 # libv8-base.a
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := v8-base
-LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIRECTORY)/android_$(TARGET_ARCH_ABI)/libv8_base.a
+LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIR)/android_$(TARGET_ARCH_ABI)/libv8_base.a
 
 include $(PREBUILT_STATIC_LIBRARY)
 
 # libv8_libbase.a
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := v8-libbase
-LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIRECTORY)/android_$(TARGET_ARCH_ABI)/libv8_libbase.a
+LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIR)/android_$(TARGET_ARCH_ABI)/libv8_libbase.a
 
 include $(PREBUILT_STATIC_LIBRARY)
 
 # libv8_snapshot.a
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := v8-snapshot
-LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIRECTORY)/android_$(TARGET_ARCH_ABI)/libv8_snapshot.a
+LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIR)/android_$(TARGET_ARCH_ABI)/libv8_snapshot.a
 
 include $(PREBUILT_STATIC_LIBRARY)
 
 else
 # dynamic
 
 # prebuilt shared libraries v8
 
 define libv8_define
     include $(CLEAR_VARS)
 
     LOCAL_MODULE := $1
-    LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIRECTORY)/android_$(TARGET_ARCH_ABI)/$1
+    LOCAL_SRC_FILES := $(SHARED_V8_LIB_DIR)/android_$(TARGET_ARCH_ABI)/$1
 
     include $(PREBUILT_SHARED_LIBRARY)
 endef
 $(foreach item,$(SHARED_V8_LIB_FILENAMES),$(eval $(call libv8_define,$(item))))
 
 endif
 
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libadblockplus-jni
 LOCAL_SRC_FILES := JniLibrary.cpp
 LOCAL_SRC_FILES += JniPlatform.cpp
 LOCAL_SRC_FILES += JniJsEngine.cpp JniFilterEngine.cpp JniJsValue.cpp
 LOCAL_SRC_FILES += JniFilter.cpp JniSubscription.cpp JniEventCallback.cpp
 LOCAL_SRC_FILES += JniLogSystem.cpp JniWebRequest.cpp
 LOCAL_SRC_FILES += JniUpdateAvailableCallback.cpp JniUpdateCheckDoneCallback.cpp
 LOCAL_SRC_FILES += JniFilterChangeCallback.cpp JniCallbacks.cpp Utils.cpp
 LOCAL_SRC_FILES += JniNotification.cpp JniShowNotificationCallback.cpp
 LOCAL_SRC_FILES += JniIsAllowedConnectionTypeCallback.cpp
 
 LOCAL_CPP_FEATURES := exceptions
 LOCAL_CPPFLAGS += -std=c++11
 
-LOCAL_C_INCLUDES := $(SHARED_V8_INCLUDE_DIRECTORY)
+LOCAL_C_INCLUDES := $(SHARED_V8_INCLUDE_DIR)
 
 LOCAL_STATIC_LIBRARIES := libadblockplus v8-libplatform
 
 ifeq ($(SHARED_V8_LIB_FILENAMES),)
 # static
 LOCAL_STATIC_LIBRARIES += v8-base v8-snapshot v8-libsampler v8-libbase
 else
 # dynamic
 LOCAL_STATIC_LIBRARIES += $(SHARED_V8_LIB_FILENAMES)
 endif
 
 include $(BUILD_SHARED_LIBRARY)