mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-11-22 12:21:15 +00:00
Fixed loadLibrary failing due to missing command line arguments.
This commit is contained in:
parent
2b3baeeda9
commit
92c30b55c1
3 changed files with 18 additions and 1 deletions
|
@ -2,7 +2,8 @@
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
package="com.nutomic.syncthingandroid"
|
package="com.nutomic.syncthingandroid"
|
||||||
android:versionCode="1"
|
android:versionCode="1"
|
||||||
android:versionName="0.1" >
|
android:versionName="0.1"
|
||||||
|
android:debuggable="true" >
|
||||||
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
|
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
|
||||||
<application android:label="@string/app_name" >
|
<application android:label="@string/app_name" >
|
||||||
<activity
|
<activity
|
||||||
|
|
|
@ -6,4 +6,8 @@ A port of [syncthing](https://github.com/calmh/syncthing) to Android.
|
||||||
|
|
||||||
Setup [goandroid](https://github.com/eliasnaur/goandroid).
|
Setup [goandroid](https://github.com/eliasnaur/goandroid).
|
||||||
|
|
||||||
|
Then, apply `go_src_pkg_flag.diff` to `src/pkg/flag/flag.go`in your local golang source, and compile and install it.
|
||||||
|
|
||||||
|
For syncthing, use [my fork](https://github.com/Nutomic/syncthing/tree/android).
|
||||||
|
|
||||||
To compile, run `./build.sh` (go cross compile) and `ant -f build.xml clean debug install run` (Android package).
|
To compile, run `./build.sh` (go cross compile) and `ant -f build.xml clean debug install run` (Android package).
|
||||||
|
|
12
go_src_pkg_flag.diff
Normal file
12
go_src_pkg_flag.diff
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff -r 19fc7167c67f src/pkg/flag/flag.go
|
||||||
|
--- a/src/pkg/flag/flag.go Sun Apr 20 12:26:05 2014 +0200
|
||||||
|
+++ b/src/pkg/flag/flag.go Mon May 05 18:27:37 2014 +0200
|
||||||
|
@@ -828,7 +828,7 @@
|
||||||
|
// CommandLine is the default set of command-line flags, parsed from os.Args.
|
||||||
|
// The top-level functions such as BoolVar, Arg, and on are wrappers for the
|
||||||
|
// methods of CommandLine.
|
||||||
|
-var CommandLine = NewFlagSet(os.Args[0], ExitOnError)
|
||||||
|
+var CommandLine = NewFlagSet("", ExitOnError)
|
||||||
|
|
||||||
|
// NewFlagSet returns a new, empty flag set with the specified name and
|
||||||
|
// error handling property.
|
Loading…
Reference in a new issue