diff options
| author | Henry Castro <hcastro@collabora.com> | 2020-04-19 12:09:41 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2020-04-21 16:03:38 +0200 |
| commit | 0e8942f88f7dfac058da02db19251cff8fe55fe5 (patch) | |
| tree | 60fb951c54aa125a7b8f3cb38cd0a5efadbf2b0a | |
| parent | android: integrate gradle task to build loleaflet (diff) | |
| download | online-0e8942f88f7dfac058da02db19251cff8fe55fe5.tar.gz online-0e8942f88f7dfac058da02db19251cff8fe55fe5.zip | |
android: configure build directory
Enable to change to build directory when
builddir != srcdir
Change-Id: I8e48897c44a5ea67da8ffebc3183d722a05e3a20
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92596
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
| -rw-r--r-- | android/.gitignore | 1 | ||||
| -rw-r--r-- | android/app/build.gradle | 1 | ||||
| -rw-r--r-- | android/build.gradle.in (renamed from android/build.gradle) | 1 | ||||
| -rw-r--r-- | android/lib/build.gradle | 2 | ||||
| -rw-r--r-- | configure.ac | 1 |
5 files changed, 6 insertions, 0 deletions
diff --git a/android/.gitignore b/android/.gitignore index 57063e6935..afb2ba6d8e 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -1,6 +1,7 @@ .gradle .idea /android.iml +/build.gradle /local.properties /lib/src/main/assets/etc/ /lib/src/main/assets/example.odt diff --git a/android/app/build.gradle b/android/app/build.gradle index 5d4be5d2a7..abb4d01b0f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -5,6 +5,7 @@ apply from: 'appSettings.gradle' android { compileSdkVersion 28 + buildDir = "${rootProject.getBuildDir()}/app" defaultConfig { // applicationId, versionCode and versionName are defined in appSettings.gradle diff --git a/android/build.gradle b/android/build.gradle.in index 56532aa698..5b78812cbc 100644 --- a/android/build.gradle +++ b/android/build.gradle.in @@ -1,4 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. +buildDir = "@builddir@/build" buildscript { repositories { diff --git a/android/lib/build.gradle b/android/lib/build.gradle index 0fa72b5610..94d695190e 100644 --- a/android/lib/build.gradle +++ b/android/lib/build.gradle @@ -5,6 +5,7 @@ apply from: 'libSettings.gradle' android { compileSdkVersion 28 + buildDir = "${rootProject.getBuildDir()}/lib" defaultConfig { minSdkVersion 21 @@ -58,6 +59,7 @@ android { externalNativeBuild { cmake { path "src/main/cpp/CMakeLists.txt" + buildStagingDirectory "${rootProject.getBuildDir()}/cmake" } } } diff --git a/configure.ac b/configure.ac index b4bf69e970..939f407e85 100644 --- a/configure.ac +++ b/configure.ac @@ -1081,6 +1081,7 @@ fi if test "$enable_androidapp" = "yes"; then AC_CONFIG_FILES([android/Makefile + android/build.gradle android/app/appSettings.gradle android/lib/libSettings.gradle android/lib/src/main/cpp/CMakeLists.txt]) |