From e731867f056a344aed11ec1e6513a4bec1eb755e Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Sat, 23 Sep 2017 22:21:01 +0200
Subject: use gradle to build the owncloud-android-lib

this will allow using current android SDK tools & emulator

Change-Id: Ic7f9996a36e4af2a5cad07e28c8830b8df12aa44
---
 android/source/build.gradle | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'android/source/build.gradle')

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 772fe443aecf..1950b2357de5 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -1,9 +1,16 @@
+apply plugin: 'com.android.application'
+// buildhost settings - paths and the like
+apply from: 'liboSettings.gradle'
+
 project.ext.set("archivesBaseName", "LibreOfficeViewer")
 allprojects {
     repositories {
         maven {
             url "https://maven.google.com"
         }
+        flatDir {
+            dirs "${liboWorkdir}/UnpackedTarball/owncloud_android_lib/build/outputs/aar"
+        }
     }
 }
 //build-time dependencies - android plugin for gradle
@@ -16,10 +23,6 @@ buildscript {
     }
 }
 
-apply plugin: 'com.android.application'
-// buildhost settings - paths and the like
-apply from: 'liboSettings.gradle'
-
 // compile-time dependencies
 dependencies {
     compile fileTree(dir: "${liboInstdir}/${liboUREJavaFolder}", include: [
@@ -30,7 +33,8 @@ dependencies {
             "unoloader.jar"
     ])
     compile files("${liboInstdir}/${liboShareJavaFolder}/unoil.jar")
-    compile files("${liboWorkdir}/UnpackedTarball/owncloud_android_lib/bin/owncloud-android-library.jar")
+    debugCompile(name:'owncloud_android_lib-debug', ext:'aar')
+    releaseCompile(name:'owncloud_android_lib-release', ext:'aar')
     compile 'com.android.support:design:26.1.0' // also pulls-in corresponding support libraries
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }
-- 
cgit