loleaflet/Makefile.am | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 15fe4b8dca1b377b29ced19667b5132e4e3b434e
Author: Henry Castro <[email protected]>
AuthorDate: Mon Apr 20 14:32:53 2020 -0400
Commit: Henry Castro <[email protected]>
CommitDate: Mon Apr 20 22:58:34 2020 +0200
android: fix "AAPT : error: resource drawable/writer not found."
Adding an empty image using the command "touch", generate a weird error
when merging resources:
* What went wrong:
Execution failed for task ':app:processDebugResources'.
> A failure occurred while executing
com.android.build.gradle.internal.tasks.Workers$ActionFacade
> Android resource linking failed
android/app/src/main/res/layout/activity_document_browser.xml:163:
AAPT: error: resource drawable/writer
(akaorg.libreoffice.androidapp.debug:drawable/writer) not found.
android/app/src/main/res/layout/activity_document_browser.xml:229:
AAPT: error: resource drawable/calc
(akaorg.libreoffice.androidapp.debug:drawable/calc) not found.
android/sid/android/app/src/main/res/layout/file_explorer_grid_item.xml:49:
AAPT: error: resource drawable/ic_more_vert_black_24dp
(aka org.libreoffice.androidapp.debug:drawable/ic_more_vert_black_24dp) not
found.
android/app/src/main/res/layout/file_list_item.xml:58:
AAPT: error: resource drawable/ic_more_vert_black_24dp
(aka org.libreoffice.androidapp.debug:drawable/ic_more_vert_black_24dp) not
found.
android/sid/android/app/src/main/res/layout/fragment_directory_browser.xml:13:
AAPT: error: resource drawable/ic_menu_back
(aka org.libreoffice.androidapp.debug:drawable/ic_menu_back) not found.
android/sid/android/app/src/main/res/menu/view_menu.xml:5:
AAPT: error: resource drawable/ic_folder_black_24dp
(aka org.libreoffice.androidapp.debug:drawable/ic_folder_black_24dp) not
found.
Change-Id: I99b0857941687846e90ad53f30cac6a7ef83beaa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92594
Tested-by: Jenkins CollaboraOffice <[email protected]>
Reviewed-by: Henry Castro <[email protected]>
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 3554ee1d3..cb2c5be31 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -338,7 +338,6 @@ if ENABLE_ANDROIDAPP
@if test -d "$(APP_BRANDING_DIR)/android" ; then for I in `cd
"$(APP_BRANDING_DIR)/android" && find . -type f` ; do mkdir -p
$(abs_top_srcdir)/android/lib/src/main/res/`dirname $$I` ; cp -a
"$(APP_BRANDING_DIR)/android/$$I"
"$(abs_top_srcdir)/android/app/src/main/res/$$I" ; done ; fi
@if test -d "$(APP_BRANDING_DIR)/online-theme" ; then mkdir -p
$(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions ; cp -a
"$(APP_BRANDING_DIR)/online-theme"
"$(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions/online"
; fi
@if test ! -e
"$(abs_top_srcdir)/android/app/src/main/res/drawable/drawer_header_brand.png" ;
then cp -a
"$(abs_top_srcdir)/android/app/src/main/res/drawable/drawer_header.png"
"$(abs_top_srcdir)/android/app/src/main/res/drawable/drawer_header_brand.png" ;
fi
- @touch
"$(abs_top_srcdir)/android/app/src/main/res/drawable/ic_launcher_brand.xml" #
to avoid problems with a missing resource in the non-branded builds
@echo
@echo "Copied JS, HTML and CSS to the Android project
(android/lib/src/main/assets/dist)."
@echo
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
