chore: Update build gradle version to 3.4.1 and updated to OpenCV4.0.1

.travis.yml

@@ -5,7 +5,7 @@ env:
   global:
     - ANDROID_API_LEVEL=22
     - ANDROID_BUILD_TOOLS_VERSION=25.0.3
-    - ANDROID_ABI=armeabi-v7a
+    - ANDROID_ABI=armeabi-v7a arm64-v8a x86 x86_64
     - ANDROID_TAG=google_apis
     - ANDROID_TARGET=android-25
     - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default)
@@ -30,7 +30,7 @@ android:
     - '.+'
     # Specify at least one system image
     - sys-img-armeabi-v7a-android-$ANDROID_API_LEVEL
-    
+
 # prevents reuploading of Cache
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
@@ -47,13 +47,11 @@ before_install:
   - mkdir "$ANDROID_HOME/licenses" || true
   - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
   - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
-  - export NDK_VERSION=r10e
-  - curl -L http://dl.google.com/android/ndk/android-ndk-${NDK_VERSION}-linux-x86_64.bin -O
-  - chmod u+x android-ndk-${NDK_VERSION}-linux-x86_64.bin
-  - ./android-ndk-${NDK_VERSION}-linux-x86_64.bin > /dev/null
-  - rm android-ndk-${NDK_VERSION}-linux-x86_64.bin
-  - export ANDROID_NDK_HOME=`pwd`/android-ndk-${NDK_VERSION}
-  - export PATH=${ANDROID_NDK_HOME}:${PATH}
+  - curl https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip -o android-ndk-r18b.zip
+  - unzip -q android-ndk-r18b.zip && rm android-ndk-r18b.zip
+  - mv android-ndk-r18b $HOME
+  - export ANDROID_NDK=$HOME/android-ndk-r18b
+
 
 install:
   - sdkmanager --list || true
@@ -62,9 +60,9 @@ install:
   - echo yes | sdkmanager "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2"
 
 licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
+  - 'android-sdk-preview-license-.+'
+  - 'android-sdk-license-.+'
+  - 'google-gdk-license-.+'
 
 before_script:
   - ./scripts/download_open_cv.sh
@@ -86,4 +84,4 @@ after_success:
   - bash scripts/update-apk.sh
 
 notifications:
-  slack: fossasia:JgzycrBUs0nKnmJhsAxCB4bL
+  slack: fossasia:JgzycrBUs0nKnmJhsAxCB4bL

app/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
+        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
     }
 }
 
@@ -22,21 +22,21 @@ def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.3"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "org.fossasia.phimpme"
         minSdkVersion 21
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 10
         versionName '1.7.1'
         multiDexEnabled true
         testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
         resConfigs "en"
         ndk {
-            abiFilters 'armeabi-v7a', 'x86'
+            abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
         }
         renderscriptTargetApi 19
         renderscriptSupportModeEnabled true
@@ -196,7 +196,7 @@ dependencies {
     androidTestCompile 'com.google.code.findbugs:jsr305:3.0.0'
 
     //opencv
-    compile project(':openCVLibrary24133')
+    compile project(':openCV')
 
     //pdk
     compile project(':pdk')

app/lint.xml

@@ -147,4 +147,6 @@
     <issue id="WorldWriteableFiles" severity="ignore" />
     <issue id="WrongManifestParent" severity="ignore" />
     <issue id="WrongViewCast" severity="ignore" />
+    <issue id="LongLogTag" severity="ignore" />
+
 </lint>

app/src/androidTest/java/org/fossasia/phimpme/leafpic/activities/HomeScreenTest.java

@@ -12,9 +12,9 @@
 import android.app.KeyguardManager;
 import android.support.test.annotation.UiThreadTest;
 import android.support.test.espresso.ViewInteraction;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;

app/src/androidTest/java/org/fossasia/phimpme/leafpic/activities/PhotoActivityTest.java

@@ -7,9 +7,9 @@
 import static org.hamcrest.Matchers.allOf;
 
 import android.support.test.espresso.ViewInteraction;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 import org.fossasia.phimpme.R;
 import org.fossasia.phimpme.opencamera.Camera.PhotoActivity;
 import org.junit.Ignore;

app/src/androidTest/java/org/fossasia/phimpme/leafpic/activities/SettingsActivityTest.java

@@ -11,9 +11,9 @@
 import android.app.KeyguardManager;
 import android.support.test.annotation.UiThreadTest;
 import android.support.test.espresso.ViewInteraction;
+import android.support.test.filters.LargeTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
-import android.test.suitebuilder.annotation.LargeTest;
 import android.view.WindowManager;
 import org.fossasia.phimpme.R;
 import org.fossasia.phimpme.gallery.activities.SettingsActivity;

app/src/main/jni/Application.mk

@@ -1,5 +1,5 @@
 APP_OPTIM := release
-APP_ABI := armeabi-v7a
-APP_STL := gnustl_static
+APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
+APP_STL := c++_static
 APP_CPPFLAGS := -frtti -fexceptions
 APP_PLATFORM := android-25

app/src/main/jni/OpenCV-arm64-v8a.mk

@@ -0,0 +1,2 @@
+OPENCV_3RDPARTY_COMPONENTS:=tbb cpufeatures libprotobuf libjpeg-turbo libwebp libpng libtiff libjasper IlmImf quirc tegra_hal
+OPENCV_EXTRA_COMPONENTS:=z dl m log

app/src/main/jni/OpenCV-armeabi-v7a.mk

@@ -0,0 +1,2 @@
+OPENCV_3RDPARTY_COMPONENTS:=tbb cpufeatures libprotobuf libjpeg-turbo libwebp libpng libtiff libjasper IlmImf quirc tegra_hal
+OPENCV_EXTRA_COMPONENTS:=z dl m log

app/src/main/jni/OpenCV-x86.mk

@@ -0,0 +1,2 @@
+OPENCV_3RDPARTY_COMPONENTS:=tbb cpufeatures ittnotify libprotobuf libjpeg-turbo libwebp libpng libtiff libjasper IlmImf quirc ippiw ippicv
+OPENCV_EXTRA_COMPONENTS:=z dl m log

app/src/main/jni/OpenCV-x86_64.mk

@@ -0,0 +1,2 @@
+OPENCV_3RDPARTY_COMPONENTS:=tbb cpufeatures ittnotify libprotobuf libjpeg-turbo libwebp libpng libtiff libjasper IlmImf quirc ippiw ippicv
+OPENCV_EXTRA_COMPONENTS:=z dl m log

app/src/main/jni/OpenCV.mk

@@ -14,43 +14,18 @@ LOCAL_PATH:=$(subst ?,,$(firstword ?$(subst \, ,$(subst /, ,$(call my-dir)))))
 OPENCV_TARGET_ARCH_ABI:=$(TARGET_ARCH_ABI)
 OPENCV_THIS_DIR:=$(patsubst $(LOCAL_PATH)\\%,%,$(patsubst $(LOCAL_PATH)/%,%,$(call my-dir)))
 OPENCV_MK_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
-OPENCV_LIBS_DIR:=$(OPENCV_THIS_DIR)/../jniLibs/$(OPENCV_TARGET_ARCH_ABI)
 OPENCV_3RDPARTY_LIBS_DIR:=$(OPENCV_THIS_DIR)/../3rdparty/libs/$(OPENCV_TARGET_ARCH_ABI)
 OPENCV_BASEDIR:=
 OPENCV_LOCAL_C_INCLUDES:="$(LOCAL_PATH)/$(OPENCV_THIS_DIR)/include/opencv" "$(LOCAL_PATH)/$(OPENCV_THIS_DIR)/include"
-OPENCV_MODULES:=contrib legacy stitching superres ocl objdetect ml ts videostab video photo calib3d features2d highgui imgproc flann androidcamera core
-
-OPENCV_HAVE_GPU_MODULE:=off
-OPENCV_USE_GPU_MODULE:=
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-    ifeq ($(OPENCV_HAVE_GPU_MODULE),on)
-        ifneq ($(CUDA_TOOLKIT_DIR),)
-            OPENCV_USE_GPU_MODULE:=on
-        endif
-    endif
-    OPENCV_DYNAMICUDA_MODULE:=
-else
-    ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-        ifeq ($(OPENCV_HAVE_GPU_MODULE),on)
-            ifneq ($(CUDA_TOOLKIT_DIR),)
-                OPENCV_USE_GPU_MODULE:=on
-            endif
-        endif
-        OPENCV_DYNAMICUDA_MODULE:=
-    else
-        OPENCV_DYNAMICUDA_MODULE:=
-    endif
-endif
-
-CUDA_RUNTIME_LIBS:=
+OPENCV_MODULES:=dnn ml objdetect photo stitching video calib3d features2d highgui flann videoio imgcodecs imgproc core
+OPENCV_SUB_MK:=$(call my-dir)/OpenCV-$(TARGET_ARCH_ABI).mk
 
 ifeq ($(OPENCV_LIB_TYPE),)
     OPENCV_LIB_TYPE:=SHARED
 endif
 
 ifeq ($(OPENCV_LIB_TYPE),SHARED)
-    OPENCV_LIBS:=java
+    OPENCV_LIBS:=java4
     OPENCV_LIB_TYPE:=SHARED
 else
     OPENCV_LIBS:=$(OPENCV_MODULES)
@@ -61,135 +36,47 @@ ifeq ($(OPENCV_LIB_TYPE),SHARED)
     OPENCV_3RDPARTY_COMPONENTS:=
     OPENCV_EXTRA_COMPONENTS:=
 else
-    ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-        OPENCV_3RDPARTY_COMPONENTS:=libjpeg libpng libtiff libjasper IlmImf
-        OPENCV_EXTRA_COMPONENTS:=log m dl z
-    endif
-    ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-        OPENCV_3RDPARTY_COMPONENTS:=libjpeg libpng libtiff libjasper IlmImf
-        OPENCV_EXTRA_COMPONENTS:=log m dl z
-    endif
-    ifeq ($(TARGET_ARCH_ABI),x86)
-        OPENCV_3RDPARTY_COMPONENTS:=libjpeg libpng libtiff libjasper IlmImf
-        OPENCV_EXTRA_COMPONENTS:=log m dl z
-    endif
-    ifeq ($(TARGET_ARCH_ABI),armeabi)
-        OPENCV_3RDPARTY_COMPONENTS:=libjpeg libpng libtiff libjasper IlmImf
-        OPENCV_EXTRA_COMPONENTS:=log m dl z
-    endif
-    ifeq ($(TARGET_ARCH_ABI),mips)
-        OPENCV_3RDPARTY_COMPONENTS:=libjpeg libpng libtiff libjasper IlmImf
-        OPENCV_EXTRA_COMPONENTS:=log m dl z
-    endif
-endif
-
-ifeq ($(OPENCV_CAMERA_MODULES),on)
-    ifeq ($(TARGET_ARCH_ABI),armeabi)
-        OPENCV_CAMERA_MODULES:= native_camera_r2.2.0 native_camera_r2.3.3 native_camera_r3.0.1 native_camera_r4.0.0 native_camera_r4.0.3 native_camera_r4.1.1 native_camera_r4.2.0 native_camera_r4.3.0 native_camera_r4.4.0
-    endif
-    ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-        OPENCV_CAMERA_MODULES:= native_camera_r2.2.0 native_camera_r2.3.3 native_camera_r3.0.1 native_camera_r4.0.0 native_camera_r4.0.3 native_camera_r4.1.1 native_camera_r4.2.0 native_camera_r4.3.0 native_camera_r4.4.0
-    endif
-    ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-        OPENCV_CAMERA_MODULES:=
-    endif
-    ifeq ($(TARGET_ARCH_ABI),x86)
-        OPENCV_CAMERA_MODULES:= native_camera_r2.3.3 native_camera_r3.0.1 native_camera_r4.0.3 native_camera_r4.1.1 native_camera_r4.2.0 native_camera_r4.3.0 native_camera_r4.4.0
-    endif
-    ifeq ($(TARGET_ARCH_ABI),mips)
-        OPENCV_CAMERA_MODULES:= native_camera_r4.0.3 native_camera_r4.1.1 native_camera_r4.2.0 native_camera_r4.3.0 native_camera_r4.4.0
-    endif
-else
-    OPENCV_CAMERA_MODULES:=
+    include $(OPENCV_SUB_MK)
 endif
 
 ifeq ($(OPENCV_LIB_TYPE),SHARED)
+    OPENCV_LIBS_DIR:=$(OPENCV_THIS_DIR)/../libs/$(OPENCV_TARGET_ARCH_ABI)
     OPENCV_LIB_SUFFIX:=so
 else
+    OPENCV_LIBS_DIR:=$(OPENCV_THIS_DIR)/../staticlibs/$(OPENCV_TARGET_ARCH_ABI)
     OPENCV_LIB_SUFFIX:=a
     OPENCV_INSTALL_MODULES:=on
 endif
 
-ifeq ($(OPENCV_INSTALL_MODULES),)
-    OPENCV_INSTALL_MODULES:=on
-endif
-
 define add_opencv_module
     include $(CLEAR_VARS)
     LOCAL_MODULE:=opencv_$1
     LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_$1.$(OPENCV_LIB_SUFFIX)
     include $(PREBUILT_$(OPENCV_LIB_TYPE)_LIBRARY)
 endef
 
-ifndef CUDA_LIBS_DIR
-    ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-        CUDA_LIBS_DIR := $(CUDA_TOOLKIT_DIR)/targets/aarch64-linux-androideabi/lib
-    else
-        CUDA_LIBS_DIR := $(CUDA_TOOLKIT_DIR)/targets/armv7-linux-androideabi/lib
-    endif
-endif
-
-define add_cuda_module
-    include $(CLEAR_VARS)
-    LOCAL_MODULE:=$1
-    LOCAL_SRC_FILES:=$(CUDA_LIBS_DIR)/lib$(1:opencv_dep_%=%).so
-    include $(PREBUILT_SHARED_LIBRARY)
-endef
-
 define add_opencv_3rdparty_component
     include $(CLEAR_VARS)
     LOCAL_MODULE:=$1
     LOCAL_SRC_FILES:=$(OPENCV_3RDPARTY_LIBS_DIR)/lib$1.a
     include $(PREBUILT_STATIC_LIBRARY)
 endef
 
-define add_opencv_camera_module
-    include $(CLEAR_VARS)
-    LOCAL_MODULE:=$1
-    LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/lib$1.so
-    include $(PREBUILT_SHARED_LIBRARY)
-endef
-
 ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED),)
     ifeq ($(OPENCV_INSTALL_MODULES),on)
         $(foreach module,$(OPENCV_LIBS),$(eval $(call add_opencv_module,$(module))))
-        ifneq ($(OPENCV_DYNAMICUDA_MODULE),)
-            ifeq ($(OPENCV_LIB_TYPE),SHARED)
-              $(eval $(call add_opencv_module,$(OPENCV_DYNAMICUDA_MODULE)))
-            endif
-        endif
-    endif
-
-    ifeq ($(OPENCV_USE_GPU_MODULE),on)
-        ifeq ($(INSTALL_CUDA_LIBRARIES),on)
-            $(foreach module,$(CUDA_RUNTIME_LIBS),$(eval $(call add_cuda_module,$(module))))
-        endif
     endif
 
     $(foreach module,$(OPENCV_3RDPARTY_COMPONENTS),$(eval $(call add_opencv_3rdparty_component,$(module))))
-    $(foreach module,$(OPENCV_CAMERA_MODULES),$(eval $(call add_opencv_camera_module,$(module))))
 
     ifneq ($(OPENCV_BASEDIR),)
         OPENCV_LOCAL_C_INCLUDES += $(foreach mod, $(OPENCV_MODULES), $(OPENCV_BASEDIR)/modules/$(mod)/include)
-        ifeq ($(OPENCV_USE_GPU_MODULE),on)
-            OPENCV_LOCAL_C_INCLUDES += $(OPENCV_BASEDIR)/modules/gpu/include
-        endif
     endif
 
     #turn off module installation to prevent their redefinition
     OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_ALREADY_INCLUDED:=on
 endif
 
-ifeq ($(OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED),)
-    ifeq ($(OPENCV_USE_GPU_MODULE),on)
-        include $(CLEAR_VARS)
-        LOCAL_MODULE:=opencv_gpu
-        LOCAL_SRC_FILES:=$(OPENCV_LIBS_DIR)/libopencv_gpu.a
-        include $(PREBUILT_STATIC_LIBRARY)
-    endif
-    OPENCV_MK_$(OPENCV_TARGET_ARCH_ABI)_GPU_ALREADY_INCLUDED:=on
-endif
-
 ifeq ($(OPENCV_LOCAL_CFLAGS),)
     OPENCV_LOCAL_CFLAGS := -fPIC -DANDROID -fsigned-char
 endif
@@ -202,21 +89,24 @@ LOCAL_STATIC_LIBRARIES:=$(USER_LOCAL_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES:=$(USER_LOCAL_SHARED_LIBRARIES)
 LOCAL_LDLIBS:=$(USER_LOCAL_LDLIBS)
 
+# Details: #10229
+ifeq ($(OPENCV_SKIP_ANDROID_IPP_FIX_1),)
+  LOCAL_LDFLAGS += -Wl,--exclude-libs,libippicv.a
+  LOCAL_LDFLAGS += -Wl,--exclude-libs,libippiw.a
+else
+  ifeq ($(OPENCV_SKIP_ANDROID_IPP_FIX_2),)
+    LOCAL_LDFLAGS += -Wl,-Bsymbolic
+  endif
+endif
+
 LOCAL_C_INCLUDES += $(OPENCV_LOCAL_C_INCLUDES)
 LOCAL_CFLAGS     += $(OPENCV_LOCAL_CFLAGS)
 
-ifeq ($(OPENCV_USE_GPU_MODULE),on)
-    LOCAL_C_INCLUDES += $(CUDA_TOOLKIT_DIR)/include
-endif
-
 ifeq ($(OPENCV_INSTALL_MODULES),on)
     LOCAL_$(OPENCV_LIB_TYPE)_LIBRARIES += $(foreach mod, $(OPENCV_LIBS), opencv_$(mod))
-    ifeq ($(OPENCV_LIB_TYPE),SHARED)
-        ifneq ($(OPENCV_DYNAMICUDA_MODULE),)
-            LOCAL_$(OPENCV_LIB_TYPE)_LIBRARIES += $(OPENCV_DYNAMICUDA_MODULE)
-        endif
-    endif
 else
+    $(call __ndk_info,OpenCV: You should ignore warning about 'non-system libraries in linker flags' and 'opencv_java' library.)
+    $(call __ndk_info,        'OPENCV_INSTALL_MODULES:=on' can be used to build APK with included OpenCV binaries)
     LOCAL_LDLIBS += -L$(call host-path,$(LOCAL_PATH)/$(OPENCV_LIBS_DIR)) $(foreach lib, $(OPENCV_LIBS), -lopencv_$(lib))
 endif
 
@@ -226,15 +116,5 @@ endif
 
 LOCAL_LDLIBS += $(foreach lib,$(OPENCV_EXTRA_COMPONENTS), -l$(lib))
 
-ifeq ($(OPENCV_USE_GPU_MODULE),on)
-    ifeq ($(INSTALL_CUDA_LIBRARIES),on)
-        LOCAL_SHARED_LIBRARIES += $(foreach mod, $(CUDA_RUNTIME_LIBS), $(mod))
-    else
-        LOCAL_LDLIBS += -L$(CUDA_LIBS_DIR) \
-            $(foreach lib, $(CUDA_RUNTIME_LIBS), -l$(lib:opencv_dep_%=%))
-    endif
-    LOCAL_STATIC_LIBRARIES+=libopencv_gpu
-endif
-
 #restore the LOCAL_PATH
 LOCAL_PATH:=$(USER_LOCAL_PATH)