[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - android/source configure.ac external/libpng

[Tor Lillqvist (via logerrit)]

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

New commits:
commit caa1da1f3b6c5d708534963d1447e05004497c47
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Feb 12 15:28:53 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Oct 22 14:18:48 2019 +0200

    The ARM Neon stuff is needed for ARM64, too (iOS at least)
    
    Not sure why the code has now started to require that, even if have
    used the same bundled libpng as for a long time.
    
    Change-Id: I2da223bc46c24563ce9d170643c28cc5c93f7d56
    Reviewed-on: https://gerrit.libreoffice.org/81229
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk
index f500720616a2..dbbc3848c541 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
 	UnpackedTarball/libpng/pngwrite \
 	UnpackedTarball/libpng/pngwtran \
 	UnpackedTarball/libpng/pngwutil \
-	$(if $(filter ARM,$(CPUNAME)),\
+	$(if $(filter ARM ARM64,$(CPUNAME)),\
 	    UnpackedTarball/libpng/arm/arm_init \
 	    UnpackedTarball/libpng/arm/filter_neon_intrinsics \
 	) \
commit 246f1b5b4485b7db9f9584e4b3b819c87e331c0e
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Jul 4 08:55:17 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Oct 22 14:18:28 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>

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 1ea328c4e6cf..a5fd073f7aeb 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 80ca6532ceea..a013d4593cfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -380,7 +380,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
 
@@ -520,7 +520,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)