[Libreoffice-commits] core.git: android/source configure.ac
android/source/AndroidManifest.xml | 2 android/source/build.gradle| 4 - android/source/gradle.properties | 2 android/source/res/layout/activity_document_browser.xml| 28 +- android/source/res/layout/activity_main.xml| 14 ++--- android/source/res/layout/number_picker.xml| 4 - android/source/res/layout/toolbar_bottom.xml | 2 android/source/res/layout/toolbar_color_picker.xml | 12 ++-- android/source/src/java/org/libreoffice/AboutDialogFragment.java | 4 - android/source/src/java/org/libreoffice/ColorPaletteAdapter.java | 4 - android/source/src/java/org/libreoffice/ColorPickerAdapter.java| 4 - android/source/src/java/org/libreoffice/FontController.java| 6 +- android/source/src/java/org/libreoffice/FormattingController.java | 4 - android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 10 +-- android/source/src/java/org/libreoffice/PasswordDialogFragment.java| 6 +- android/source/src/java/org/libreoffice/PresentationActivity.java | 8 +- android/source/src/java/org/libreoffice/ToolbarController.java | 2 android/source/src/java/org/libreoffice/UNOCommandsController.java | 2 android/source/src/java/org/libreoffice/canvas/BitmapHandle.java | 2 android/source/src/java/org/libreoffice/overlay/CalcHeadersController.java | 2 android/source/src/java/org/libreoffice/overlay/CalcHeadersView.java | 2 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 18 +++--- android/source/src/java/org/libreoffice/ui/RecentFilesAdapter.java | 4 - configure.ac | 8 -- 24 files changed, 73 insertions(+), 81 deletions(-) New commits: commit 70cb4955f1c099b030567e6bf4702f7dc6ee521a Author: Michael Weghorn AuthorDate: Thu Apr 14 11:29:27 2022 +0200 Commit: Michael Weghorn CommitDate: Thu Apr 14 16:49:41 2022 +0200 android: Port from Android Support Lib to AndroidX Replace the no longer maintained Android Support Library with the Android Jetpack libraries. Quoting [1]: > Version 28.0.0 is the last release of the Support Library. There will be > no more android.support library releases. All new feature development > will be in the androidx namespace. Most porting was done automatically by using Android Studio's "Refactor" -> "Migrate to AndroidX..." function. In `android/source/res/layout/toolbar_bottom.xml` and `android/source/res/layout/toolbar_color_picker.xml`, the uses of `app:layout_behavior="android.support.design.widget.BottomSheetBehavior"` had to be replaced manually as described at [2], because the app would crash when using the old "android.support" values. Also drop the Android Support Library related bits from configure.ac In a quick test, this worked fine and no obvious difference was visible when running this in various AVDs. When trying to test this in an x86 AVD still using SDK 16 (Android 4.1), which is currently specified as Android Viewer's `minSdkVersion`, only various unrelated issues showed up, some of which will be handled in follow-up commits. After the migration, many weird errors showed up in Android Studio, which disappeared after invalidating the caches (via "File" -> "Invalidate Caches..."). [1] https://developer.android.com/jetpack/androidx [2] https://stackoverflow.com/questions/45100963/runtimeexception-could-not-inflate-behavior-subclass Change-Id: I2a57f0ebd56e7ecc09b7d65aae17fd15088a633b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133002 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/AndroidManifest.xml b/android/source/AndroidManifest.xml index 987aeed66ae6..43f790fca985 100644 --- a/android/source/AndroidManifest.xml +++ b/android/source/AndroidManifest.xml @@ -116,7 +116,7 @@ diff --git a/android/source/build.gradle b/android/source/build.gradle index a690749ff0ee..7dc93e778a7c 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -27,8 +27,8 @@ dependencies { "libreoffice.jar", "unoloader.jar" ]) -implementation 'com.android.support:design:27.1.1' // also pulls-in corresponding support libraries -implementation 'com.android.support.constraint:constraint-layout:1.1.2' +implementation 'com.google.android.material:material:1.0.0' +implementation 'androidx.constraintl
[Libreoffice-commits] core.git: android/source configure.ac
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 AuthorDate: Thu Jul 4 08:55:17 2019 +0200 Commit: Jan Holesovsky 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 Reviewed-by: Jan Holesovsky (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) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source configure.ac solenv/gbuild
android/source/gradle.properties |1 + configure.ac | 11 --- solenv/gbuild/platform/com_GCC_defs.mk |4 +++- 3 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 3de5cd341d861faeadabec16ff675d764f8df4b6 Author: Christian Lohmaier Date: Thu Sep 7 18:27:12 2017 +0200 android: tune symbols for lldb & we actually target 14 as minSDK -glldb might be placebo switch like -ggdb2, but at last it won't hurt :-) increase java heap size for gradle to allow inprocess dex as well as actually processing the huge files. furthermore fix platform level in configure to match the minSDK value from build.gradle Change-Id: I57d7d4c67bc3e5ed8bfed1e592b85211b5b8905a Reviewed-on: https://gerrit.libreoffice.org/42162 Reviewed-by: Christian Lohmaier Tested-by: Jenkins diff --git a/android/source/gradle.properties b/android/source/gradle.properties new file mode 100644 index ..899c9f99f396 --- /dev/null +++ b/android/source/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx2048m diff --git a/configure.ac b/configure.ac index f053df0192c7..f616afef856e 100644 --- a/configure.ac +++ b/configure.ac @@ -474,18 +474,15 @@ if test -n "$with_android_ndk"; then fi fi -ANDROID_API_LEVEL=15 +ANDROID_API_LEVEL=14 if test $host_cpu = arm; then android_gnu_prefix=arm-linux-androideabi elif test $host_cpu = aarch64; then android_gnu_prefix=aarch64-linux-android ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR="${with_android_ndk_toolchain_version}/" -ANDROID_API_LEVEL=L +ANDROID_API_LEVEL=21 elif test $host_cpu = mips; then android_gnu_prefix=mipsel-linux-android -elif test $ANDROID_NDK_VERSION = r8; then -# The prefix used for the x86 tool-chain changed between NDK r8 and r8b -android_gnu_prefix=i686-android-linux else android_gnu_prefix=i686-linux-android fi @@ -850,7 +847,7 @@ linux-android*) ;; esac -if echo "$host_os" | grep -q linux-android ; then +if test "$_os" = "Android" ; then if test -z "$with_android_sdk"; then AC_MSG_ERROR([the --with-android-sdk option is mandatory, unless it is available at external/android-sdk-linux/.]) fi @@ -11883,7 +11880,7 @@ else fi AC_SUBST(OOO_VENDOR) -if echo "$host_os" | grep -q linux-android ; then +if test "$_os" = "Android" ; then ANDROID_PACKAGE_NAME= AC_MSG_CHECKING([for Android package name]) if test -z "$with_android_package_name" -o "$with_android_package_name" = "no"; then diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 793e5d34f656..3cecb8286311 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -165,8 +165,10 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) # optimization level gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow +ifeq ($(OS),ANDROID) +gb_DEBUGINFO_FLAGS=-glldb # Clang does not know -ggdb2 or some other options -ifeq ($(HAVE_GCC_GGDB2),TRUE) +else ifeq ($(HAVE_GCC_GGDB2),TRUE) gb_DEBUGINFO_FLAGS=-ggdb2 else gb_DEBUGINFO_FLAGS=-g2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source configure.ac download.lst external/Module_external.mk external/owncloud-android-lib Makefile.fetch RepositoryExternal.mk
Makefile.fetch|1 RepositoryExternal.mk | 16 ++ android/source/Makefile |2 configure.ac |3 + download.lst |2 external/Module_external.mk |1 external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk | 24 ++ external/owncloud-android-lib/Makefile|7 ++ external/owncloud-android-lib/Module_owncloud-android-lib.mk | 17 +++ external/owncloud-android-lib/README |7 ++ external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk | 14 + 11 files changed, 94 insertions(+) New commits: commit e6fe508d6835590c6245e62e2c014808453e7d92 Author: Jacobo Aragunde Pérez Date: Mon Feb 2 19:49:37 2015 + Android: add ownCloud library to the build. Library code from https://github.com/jaragunde/owncloud-android-library This patch downloads, builds and installs the library from a tarball uploaded to http://dev-www.libreoffice.org/src/. Change-Id: I28afaea4dabe2dab869b53b1881f4d5a6522943f Reviewed-on: https://gerrit.libreoffice.org/16190 Tested-by: Jenkins Reviewed-by: Jacobo Aragunde Pérez diff --git a/Makefile.fetch b/Makefile.fetch index 7aee66a..390d3d0 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -189,6 +189,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,OPENLDAP,OPENLDAP_TARBALL) \ $(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \ $(call fetch_Optional,ORCUS,ORCUS_TARBALL) \ + $(call fetch_Optional,OWNCLOUD_ANDROID_LIB,OWNCLOUD_ANDROID_LIB_TARBALL) \ $(call fetch_Optional,PAGEMAKER,PAGEMAKER_TARBALL) \ $(call fetch_Optional,POPPLER,POPPLER_TARBALL) \ $(call fetch_Optional,POSTGRESQL,POSTGRESQL_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 726ef75..5b8b3a2 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4104,4 +4104,20 @@ endef endif +ifeq (OWNCLOUD_ANDROID_LIB,$(filter OWNCLOUD_ANDROID_LIB,$(BUILD_TYPE))) + +$(eval $(call gb_Helper_register_jars,OXT,\ + owncloud-android-library \ +)) + +define gb_Jar__use_owncloud_android_lib +$(call gb_Jar_use_external_project,$(1),owncloud-android-lib) +$(call gb_Jar_use_external_jar,$(1),$(call gb_UnpackedTarball_get_dir,owncloud-android-lib)/bin/owncloud-android-library.jar) +endef +define gb_ExternalProject__use_owncloud_android_lib +$(call gb_ExternalProject_use_external_project,$(1),owncloud_android_lib) +endef + +endif + # vim: set noet sw=4 ts=4: diff --git a/android/source/Makefile b/android/source/Makefile index 3bf2c15..6f70a91 100644 --- a/android/source/Makefile +++ b/android/source/Makefile @@ -32,6 +32,8 @@ build-ant: android_version_setup copy-stuff prepare-appcompat link-so properties for F in unoil; do \ $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \ done + #ownCloud lib dependency + $(call COPYJAR,$(WORKDIR)/UnpackedTarball/owncloud_android_lib/bin/owncloud-android-library.jar) # unset JAVA_HOME && $(ANT) $(if $(VERBOSE)$(verbose),,-quiet) $(if $(ENABLE_RELEASE_BUILD),release,debug) diff --git a/configure.ac b/configure.ac index 2ebe501..178c663 100644 --- a/configure.ac +++ b/configure.ac @@ -511,6 +511,9 @@ if test -n "$with_android_ndk"; then ;; esac fi + +# remember to download the ownCloud Android library later +BUILD_TYPE="$BUILD_TYPE OWNCLOUD_ANDROID_LIB" fi AC_SUBST(ANDROID_NDK_GDBSERVER) AC_SUBST(ANDROID_APP_ABI) diff --git a/download.lst b/download.lst index 7b4bfe4..fdb4d5c 100644 --- a/download.lst +++ b/download.lst @@ -119,6 +119,8 @@ export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz export OPENSSL_MD5SUM := a06c547dac9044161a477211049f60ef export OPENSSL_TARBALL := openssl-1.0.2a.tar.gz export ORCUS_TARBALL := 18814358772ed7bb476e04b0384af082-liborcus-0.9.1.tar.gz +export OWNCLOUD_ANDROID_LIB_MD5SUM := 593f0aa47bf2efc0efda2d28fae063b2 +export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 diff --git a/external/Module_external.mk b/external/Module_external.mk index 6d38fd5..8b4fb6c 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -80,6 +80,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\