Merge pull request #719 from elucideye/pr.android.armv7

Android Studio ARMv7 testing

.travis.yml

@@ -63,6 +63,11 @@ matrix:
         ANDROID_STUDIO_ARCH=arm64-v8a
         TYPE=android-studio
 
+    - os: linux
+      env: >
+        ANDROID_STUDIO_ARCH=armeabi-v7a
+        TYPE=android-studio
+
     # }
 
     # OSX {

bin/jenkins.sh

@@ -208,8 +208,8 @@ case "${TYPE}" in
     ./gradlew assembleDebug -Parch=${ANDROID_STUDIO_ARCH} || echo "Ooops"
 
     # Sometimes second launch failing with the same error, put a wait command
-    # to try to improve stability (empirical note: 15 is not enough)
-    sleep 30
+    # to try to improve stability (empirical note: 30 is not enough)
+    sleep 45
 
     # Now should be fine
     ../bin/travis_wait -i 60 "./gradlew assembleDebug -Parch=${ANDROID_STUDIO_ARCH}"

src/examples/cmake/template/toolchain.cmake.in

@@ -80,6 +80,12 @@ if("${_INTERNAL_ANDROID_STUDIO_ORIGINAL_CMAKE_TOOLCHAIN_FILE}" STREQUAL "${CMAKE
   message(FATAL_ERROR "Internal error")
 endif()
 
+# Before including Android NDK toolchain
+if("${CMAKE_ANDROID_ARCH_ABI}" STREQUAL "armeabi-v7a")
+  set(ANDROID_ARM_NEON TRUE CACHE BOOL "..." FORCE)
+  set(ANDROID_ARM_MODE "arm" CACHE STRING "..." FORCE)
+endif()
+
 set(ANDROID_NDK "") # Suppress warning
 include("${_INTERNAL_ANDROID_STUDIO_ORIGINAL_CMAKE_TOOLCHAIN_FILE}")
 

src/examples/facefilter/android-studio/app/build.gradle

@@ -29,7 +29,11 @@ android {
 
     defaultConfig {
         applicationId 'com.elucideye.facefilter'
+
+        // https://developer.android.com/reference/android/support/v4/app/ActivityCompat#requestpermissions
+        // See FaceFilterCameraManager.java
         minSdkVersion 24
+
         targetSdkVersion 27
         externalNativeBuild {
             cmake {