diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2021-03-17 12:54:01 +0100 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-03-22 07:55:52 +0100 |
commit | 2fa33c89ffcf0bb5aa013ee71a06b12676b42997 (patch) | |
tree | 7ea004376ef2fa51b5c9268f898a29fd69865a51 /external | |
parent | 6012599e17206ee7be9a83477654e7bd194079c3 (diff) |
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 <m.weghorn@posteo.de>
Diffstat (limited to 'external')
-rw-r--r-- | external/Module_external.mk | 1 | ||||
-rw-r--r-- | external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk | 23 | ||||
-rw-r--r-- | external/owncloud-android-lib/Makefile | 7 | ||||
-rw-r--r-- | external/owncloud-android-lib/Module_owncloud-android-lib.mk | 19 | ||||
-rw-r--r-- | external/owncloud-android-lib/README | 7 | ||||
-rw-r--r-- | external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk | 16 | ||||
-rw-r--r-- | external/owncloud-android-lib/build.gradle | 57 |
7 files changed, 0 insertions, 130 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk index ae54d6f48794..2282f5956b67 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' - ] - } - } - } -} |