summaryrefslogtreecommitdiff
path: root/.gitignore
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 /.gitignore
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 '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index e198d7f05feb..3af6d8f1b2b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,6 @@
# autoconf generated stuff
/aclocal.m4
-/android/source/AndroidManifest.xml
/autom4te.cache
/autogen.input
/autogen.lastrun