diff options
author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-09-23 22:21:01 +0200 |
---|---|---|
committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-09-24 13:58:16 +0200 |
commit | e731867f056a344aed11ec1e6513a4bec1eb755e (patch) | |
tree | 24dfab636af48d3d747e00b78da08f3a1b6ff4ee /external/owncloud-android-lib | |
parent | 53b96765c555146e5c6a3a614420bfeeebc92b58 (diff) |
use gradle to build the owncloud-android-lib
this will allow using current android SDK tools & emulator
Change-Id: Ic7f9996a36e4af2a5cad07e28c8830b8df12aa44
Diffstat (limited to 'external/owncloud-android-lib')
3 files changed, 52 insertions, 5 deletions
diff --git a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk index 8dbd910d665c..a9d7591c1190 100644 --- a/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk +++ b/external/owncloud-android-lib/ExternalProject_owncloud_android_lib.mk @@ -15,11 +15,7 @@ $(eval $(call gb_ExternalProject_register_targets,owncloud_android_lib,\ $(call gb_ExternalProject_get_state_target,owncloud_android_lib,build) : $(call gb_ExternalProject_run,build,\ - $(ICECREAM_RUN) "$(ANT)" \ - $(if $(verbose),-v,-q) \ - -f build.xml \ - -Dsdk.dir=$(ANDROID_SDK_HOME) -Dtarget=android-22 \ - release \ + ANDROID_HOME=$(ANDROID_SDK_HOME) $(SRCDIR)/android/source/gradlew assemble \ ) # vim: set noet sw=4 ts=4: diff --git a/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk b/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk index 0866f6f504e2..b9038cd1c961 100644 --- a/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk +++ b/external/owncloud-android-lib/UnpackedTarball_owncloud_android_lib.mk @@ -11,4 +11,6 @@ $(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 new file mode 100644 index 000000000000..beb627fcc437 --- /dev/null +++ b/external/owncloud-android-lib/build.gradle @@ -0,0 +1,49 @@ +apply plugin: 'com.android.library' +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.3.3' + } +} + +android { + useLibrary 'org.apache.http.legacy' + + compileOptions { + encoding 'ISO8859-1' + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + compileSdkVersion 26 + buildToolsVersion "26.0.1" + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 24 + } + + 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' + ] + } + } + } +} |