[Libreoffice-commits] core.git: android/source configure.ac

[Jan Holesovsky (via logerrit)]

 android/source/build.gradle                             |    3 +--
 android/source/gradle/wrapper/gradle-wrapper.properties |    2 +-
 configure.ac                                            |    4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 7e20dcbae47395e7d922ccd9fc5c30dcc205b32f
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Jul 4 08:55:17 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Oct 24 00:36:08 2019 +0200

    android: Allow using SDK and NDK directly from the Android Studio.
    
    Just specify:
    
    --with-android-ndk=$HOME/Android/Sdk/ndk-bundle
    --with-android-sdk=$HOME/Android/Sdk
    
    in your autogen.input, install the appropriate components via Android
    Studio and you are done.
    
    Change-Id: Ic99790b781b9017eb4e642380e230d6f7b49e9b7
    Reviewed-on: https://gerrit.libreoffice.org/81228
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 246f1b5b4485b7db9f9584e4b3b819c87e331c0e)
    Reviewed-on: https://gerrit.libreoffice.org/81328
    Tested-by: Jenkins

diff --git a/android/source/build.gradle b/android/source/build.gradle
index f7fd32f56642..9d9e35f18a69 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -33,8 +33,7 @@ dependencies {
             "unoloader.jar"
     ])
     implementation files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
-    debugImplementation(name:'owncloud_android_lib-debug', ext:'aar')
-    releaseImplementation(name:'owncloud_android_lib-release', ext:'aar')
+    implementation(name:'owncloud_android_lib', ext:'aar')
     implementation 'com.android.support:design:27.1.1' // also pulls-in corresponding support libraries
     implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 }
diff --git a/android/source/gradle/wrapper/gradle-wrapper.properties b/android/source/gradle/wrapper/gradle-wrapper.properties
index 1490158923d0..617dcf1065c3 100644
--- a/android/source/gradle/wrapper/gradle-wrapper.properties
+++ b/android/source/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
diff --git a/configure.ac b/configure.ac
index 9c8d512be07b..43cdf69ac8a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,7 +391,7 @@ if test -z "$with_android_ndk" -a -e "$SRC_ROOT/external/android-ndk" -a "$build
     with_android_ndk="$SRC_ROOT/external/android-ndk"
 fi
 if test -n "$with_android_ndk"; then
-    ANDROID_NDK_HOME=$with_android_ndk
+    eval ANDROID_NDK_HOME=$with_android_ndk
 
     # Set up a lot of pre-canned defaults
 
@@ -525,7 +525,7 @@ if test -z "$with_android_sdk" -a -e "$SRC_ROOT/external/android-sdk-linux" -a "
     with_android_sdk="$SRC_ROOT/external/android-sdk-linux"
 fi
 if test -n "$with_android_sdk"; then
-    ANDROID_SDK_HOME=$with_android_sdk
+    eval ANDROID_SDK_HOME=$with_android_sdk
     PATH="$ANDROID_SDK_HOME/platform-tools:$ANDROID_SDK_HOME/tools:$PATH"
 fi
 AC_SUBST(ANDROID_SDK_HOME)