summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-10-11 01:53:29 +0200
committerTomaž Vajngerl <tomaz.vajngerl@collabora.com>2015-10-15 10:28:28 +0200
commit9b35f433a63e6c6f45705e252fe7ae622b5e2742 (patch)
tree5e3c6bd64762bafba71b3768415ea425c0282304 /Makefile.in
parent9abbcf772cab74abb9ee4603d71546ce2104ce25 (diff)
migrate android build to gradle
move preparation tasks (creating assets/processing files) from the makefile into the gradle script This allows much easier integration into android-studio (just open android/source with android studio after running make to compile the native library) (cherry picked from commit ee8257a1c70eadb7330b0ee99ec3b86fe4084bdf) Change-Id: I9a9d6832797c24a7e195a1c7954cd6d20f5a8496
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 61cc90680530..914699eb14ae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,7 +43,6 @@ $(BUILDDIR)/config_host.mk : $(wildcard \
$(SRCDIR)/instsetoo_native/util/openoffice.lst.in \
$(SRCDIR)/configure.ac \
$(SRCDIR)/config_host/*.h.in \
- $(SRCDIR)/android/source/AndroidManifest.xml.in \
$(BUILDDIR)/autogen.input \
$(BUILDDIR)/autogen.lastrun \
$(BUILDDIR)/autogen.sh \