diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2019-07-04 08:55:17 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-10-24 00:36:08 +0200 |
| commit | 7e20dcbae47395e7d922ccd9fc5c30dcc205b32f (patch) | |
| tree | 17577f8f0edb8530a55e816aa74c4eb031960d1a /android/source | |
| parent | 044709575e907ffc74f85c395219207b51370c05 (diff) | |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
(cherry picked from commit 246f1b5b4485b7db9f9584e4b3b819c87e331c0e)
Reviewed-on: https://gerrit.libreoffice.org/81328
Tested-by: Jenkins
Diffstat (limited to 'android/source')
| -rw-r--r-- | android/source/build.gradle | 3 | ||||
| -rw-r--r-- | android/source/gradle/wrapper/gradle-wrapper.properties | 2 |
2 files changed, 2 insertions, 3 deletions
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 |