diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-11 18:25:23 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-11 20:22:12 +0100 |
| commit | 97e9a83888a377035f99fc6dd0566482469a3dfa (patch) | |
| tree | 4176d0462cd30a795c14fd24270132b3eed04a31 /android | |
| parent | c65c1717fe7ff350564c8534b8ef579437601762 (diff) | |
android: Fix asset handling in build.gradle
... after commit 367431b6987b75e7a201499bfbd25a41c92a4a59
("tdf#126909 android: include icons into APK") had accidently
not only added the icon zip file to the 'assets/share/config' folder,
but also caused the assets mentioned below in build.gradle
to be copied there instead of the proper places, leading to
a crash when trying to access them.
(The problem did not show up in an incremental build, since "the
old copies" of the assets were still present where expected.)
Change-Id: I7d9cf89c399d6415ce97ac8af4a98610555c5f17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90344
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'android')
| -rw-r--r-- | android/source/build.gradle | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/android/source/build.gradle b/android/source/build.gradle index 525782abc606..668ff5e006b9 100644 --- a/android/source/build.gradle +++ b/android/source/build.gradle @@ -161,9 +161,11 @@ task copyAssets(type: Copy) { } // include icons - into 'assets/share/config' - from ("${liboInstdir}/share/config") { - includes = ["images_**.zip", ] + into ('share') { + into ('config') { + from ("${liboInstdir}/share/config") + includes = ['images_**.zip'] + } } into('program') { |