From d8d7bc8c834beef0e03e652f3cef6b40ea509b87 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Wed, 17 Mar 2021 12:54:01 +0100 Subject: Drop external owncloud-android-lib It's no longer used by Android Viewer and use in the online-based Android app has already been removed in online commit commit 2a52d768dd61f2ef8fedccb32f015c9095915935 Date: Wed Feb 19 09:05:56 2020 +0100 android shell: Remove the 'storage framework', we have content providers. Change-Id: I468c7121eb495eb8b1a8892f14f2c289b94b7a93 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112766 Tested-by: Jenkins Reviewed-by: Michael Weghorn (cherry picked from commit 2fa33c89ffcf0bb5aa013ee71a06b12676b42997) --- Makefile.fetch | 1 - RepositoryExternal.mk | 16 ------ configure.ac | 3 -- download.lst | 2 - external/Module_external.mk | 1 - .../ExternalProject_owncloud_android_lib.mk | 23 --------- external/owncloud-android-lib/Makefile | 7 --- .../Module_owncloud-android-lib.mk | 19 -------- external/owncloud-android-lib/README | 7 --- .../UnpackedTarball_owncloud_android_lib.mk | 16 ------ external/owncloud-android-lib/build.gradle | 57 ---------------------- readlicense_oo/license/license.xml | 17 ------- 12 files changed, 169 deletions(-) delete mode 100644 external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk delete mode 100644 external/owncloud-android-lib/Makefile delete mode 100644 external/owncloud-android-lib/Module_owncloud-android-lib.mk delete mode 100644 external/owncloud-android-lib/README delete mode 100644 external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk delete mode 100644 external/owncloud-android-lib/build.gradle diff --git a/Makefile.fetch b/Makefile.fetch index 0a6202a4b3c7..2822d0a854f2 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -201,7 +201,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(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,PDFIUM,PDFIUM_TARBALL) \ $(call fetch_Optional,POPPLER,POPPLER_TARBALL) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ad3febbae41b..d8ecef038930 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -4103,22 +4103,6 @@ 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 - ifneq ($(ENABLE_ONLINE_UPDATE_MAR),) ifneq ($(SYSTEM_BZIP2),) diff --git a/configure.ac b/configure.ac index b0746dd5304a..c10dc6cdc7b2 100644 --- a/configure.ac +++ b/configure.ac @@ -751,9 +751,6 @@ if test -n "$with_android_ndk"; then CXX="$ANDROID_COMPILER_BIN/clang++ $ANDROIDCXXFLAGS" CXX_BASE="clang++" fi - - # remember to download the ownCloud Android library later - BUILD_TYPE="$BUILD_TYPE OWNCLOUD_ANDROID_LIB" fi AC_SUBST(ANDROID_NDK_HOME) AC_SUBST(ANDROID_APP_ABI) diff --git a/download.lst b/download.lst index 62c14cdb39da..aa9e647dab06 100644 --- a/download.lst +++ b/download.lst @@ -208,8 +208,6 @@ export OPENSSL_SHA256SUM := e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de6 export OPENSSL_TARBALL := openssl-1.1.1i.tar.gz export ORCUS_SHA256SUM := c700d1325f744104d9fca0d5a019434901e9d51a16eedfb05792f90a298587a4 export ORCUS_TARBALL := liborcus-0.16.1.tar.bz2 -export OWNCLOUD_ANDROID_LIB_SHA256SUM := b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb -export OWNCLOUD_ANDROID_LIB_TARBALL := owncloud-android-library-0.9.4-no-binary-deps.tar.gz export PAGEMAKER_SHA256SUM := 66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d export PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz export PDFIUM_SHA256SUM := eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8 diff --git a/external/Module_external.mk b/external/Module_external.mk index 1c722a325c2d..b6be1edd7190 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,OPENLDAP,openldap) \ $(call gb_Helper_optional,OPENSSL,openssl) \ $(call gb_Helper_optional,ORCUS,liborcus) \ - $(call gb_Helper_optional,OWNCLOUD_ANDROID_LIB,owncloud-android-lib) \ $(call gb_Helper_optional,PAGEMAKER,libpagemaker) \ $(call gb_Helper_optional,PDFIUM,pdfium) \ $(call gb_Helper_optional,POPPLER,poppler) \ diff --git a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk deleted file mode 100644 index 149becee9209..000000000000 --- a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk +++ /dev/null @@ -1,23 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalProject_ExternalProject,owncloud_android_lib)) - -$(eval $(call gb_ExternalProject_register_targets,owncloud_android_lib,\ - build \ -)) - -$(call gb_ExternalProject_get_state_target,owncloud_android_lib,build) : - $(call gb_Trace_StartRange,owncloud_android_lib,EXTERNAL) - $(call gb_ExternalProject_run,build,\ - ANDROID_HOME=$(ANDROID_SDK_HOME) $(SRCDIR)/android/source/gradlew assemble \ - ) - $(call gb_Trace_EndRange,owncloud_android_lib,EXTERNAL) - -# vim: set noet sw=4 ts=4: diff --git a/external/owncloud-android-lib/Makefile b/external/owncloud-android-lib/Makefile deleted file mode 100644 index e4968cf85fb6..000000000000 --- a/external/owncloud-android-lib/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - -include $(module_directory)/../../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/external/owncloud-android-lib/Module_owncloud-android-lib.mk b/external/owncloud-android-lib/Module_owncloud-android-lib.mk deleted file mode 100644 index a57e70a79b84..000000000000 --- a/external/owncloud-android-lib/Module_owncloud-android-lib.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Module_Module,owncloud_android_lib)) - -ifneq ($(ENABLE_JAVA),) -$(eval $(call gb_Module_add_targets,owncloud_android_lib, \ - ExternalProject_owncloud_android_lib \ - UnpackedTarball_owncloud_android_lib \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/owncloud-android-lib/README b/external/owncloud-android-lib/README deleted file mode 100644 index 921619d630cc..000000000000 --- a/external/owncloud-android-lib/README +++ /dev/null @@ -1,7 +0,0 @@ -Library required to access ownCloud servers from Android. - -Code from https://github.com/jaragunde/owncloud-android-library, release 0.9.4. -Notice it is a fork from the official repository at -https://github.com/owncloud/android-library, the test and example projects have -been removed and the binary jars have been replaced with the sources of the -required libraries. diff --git a/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk b/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk deleted file mode 100644 index b9038cd1c961..000000000000 --- a/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,owncloud_android_lib)) - -$(eval $(call gb_UnpackedTarball_set_tarball,owncloud_android_lib,$(OWNCLOUD_ANDROID_LIB_TARBALL))) - -$(eval $(call gb_UnpackedTarball_add_file,owncloud_android_lib,build.gradle,external/owncloud-android-lib/build.gradle)) - -# vim: set noet sw=4 ts=4: diff --git a/external/owncloud-android-lib/build.gradle b/external/owncloud-android-lib/build.gradle deleted file mode 100644 index 9203dc45a549..000000000000 --- a/external/owncloud-android-lib/build.gradle +++ /dev/null @@ -1,57 +0,0 @@ -apply plugin: 'com.android.library' -buildscript { - repositories { - jcenter() - google() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' - } -} - -allprojects { - repositories { - jcenter() - google() - } -} - -android { - useLibrary 'org.apache.http.legacy' - - compileOptions { - encoding 'ISO8859-1' - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - - compileSdkVersion 26 - buildToolsVersion "27.0.3" - - defaultConfig { - minSdkVersion 16 - targetSdkVersion 26 - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java { - srcDirs = [ - 'libs/commons-codec-1.9/src/main/java', - 'libs/commons-httpclient-3.1/src/java', - 'libs/jackrabbit-webdav-2.7.2/src/main/java', - 'libs/slf4j-1.7.12/src/java', - 'libs/tomcat-7.0.40/java', - 'src' - ] - } - resources { - srcDirs = [ - 'libs/tomcat-7.0.40/java', - 'libs/jackrabbit-webdav-2.7.2/src/main/java' - ] - } - } - } -} diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 2c45a12fd202..77ca913c7d74 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -1575,23 +1575,6 @@ changed. i.e. this code cannot simply be copied and put under another distribution license [including the GNU Public License.]

-
-

ownCloud Android Library

-

The following software may be included in this product: ownCloud Android Library. ownCloud Android Library - is available under MIT license.

-

Copyright (C) 2019 ownCloud GmbH. Copyright (C) 2012 Bartek Przybylski

-

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated - documentation files (the "Software"), to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

-

The above copyright notice and this permission notice shall be included in all copies or substantial - portions of the Software.

-

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT - LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT - SHALL THE AUTHORS OR COPYRIGHT HOLDERSBE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE.

-

PDFium

The following software may be included in this product: PDFium. Use of any of this software is governed by -- cgit