Use CGO to build Syncthing with support for DNS (fixes #57)

.gitignore

@@ -38,6 +38,9 @@ proguard/
 gradle/wrapper/gradle/
 gradle/wrapper/gradlew*
 
+# Go native dependencies
+ext/golang/dist
+
 # Syncthing native dependencies
 ext/syncthing/pkg/
 ext/syncthing/src/code.google.com/

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "ext/syncthing/src/github.com/syncthing/syncthing"]
 	path = ext/syncthing/src/github.com/syncthing/syncthing
 	url = https://github.com/syncthing/syncthing.git
+[submodule "ext/golang/go"]
+	path = ext/golang/go
+	url = https://github.com/golang/go.git
+[submodule "ext/golang/go1.4"]
+	path = ext/golang/go1.4
+	url = https://github.com/golang/go.git

build.gradle

@@ -27,10 +27,6 @@ dependencies {
     androidTestCompile 'com.squareup.okhttp:mockwebserver:2.4.0'
 }
 
-preBuild {
-    dependsOn 'buildNative'
-}
-
 project.archivesBaseName = 'syncthing'
 
 android {
@@ -104,24 +100,8 @@ android {
 
 task buildNative(type: Exec) {
     outputs.upToDateWhen { false }
-    executable = './build-syncthing.sh'
-}
-
-task copyNative(type: Copy) {
-    def lib_dir = "libs/"
-    new File(lib_dir).mkdirs()
-    def st_dir = "bin/";
-    from st_dir + 'syncthing-x86', st_dir + 'syncthing-armeabi';
-    into lib_dir
-    rename('syncthing-x86', 'x86/libsyncthing.so')
-    rename('syncthing-armeabi', 'armeabi/libsyncthing.so')
-}
-buildNative.finalizedBy copyNative
-
-task cleanBin(type: Delete) {
-    delete 'bin/'
+    executable = './make-all.bash'
 }
-copyNative.finalizedBy cleanBin
 
 task cleanNative(type: Delete) {
     delete 'bin/'