[tor-commits] [orbot/master] update gradle props and ignore files we don't want in repo

[n8fr8 at torproject.org]

commit 9afbb0007ff0f6268129968f96ea4a660745ba61
Author: Nathan Freitas <nathan at freitas.net>
Date:   Sun Sep 25 18:51:22 2016 -0400

    update gradle props and ignore files we don't want in repo
---
 .gitignore        |  2 ++
 gradle.properties | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/.gitignore b/.gitignore
index c3831e3..14fdc21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,5 @@ obj
 
 
 app/src/main/jniLibs/
+app/src/main/libs/
+orbotservice/src/main/assets/armeabi/
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..f6a934d
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,16 @@
+## Project-wide Gradle settings.
+#
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+#
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+#Mon Jun 20 21:44:59 EDT 2016
+android.useDeprecatedNdk=true