diff options
-rw-r--r-- | README.md | 44 | ||||
-rwxr-xr-x | compile-native-openvpn.sh (renamed from compile-with-ndk.sh) | 2 | ||||
-rwxr-xr-x | compile.sh | 8 |
3 files changed, 52 insertions, 2 deletions
diff --git a/README.md b/README.md new file mode 100644 index 00000000..61f9346d --- /dev/null +++ b/README.md @@ -0,0 +1,44 @@ +# Bitmask Android App + +This repository contains the source code for the [Bitmask][https://bitmask.net/] Android app. + +Please see the [issues](https://github.com/leapcode/bitmask_android/issues) section to +report any bugs or feature requests and to see the list of known issues. + +## License + +* [See LICENSE file](https://github.com/leapcode/bitmask_android/blob/master/LICENSE.txt) + +## Building + +The build requires [Ant](https://ant.apache.org/) v1.6+, the [Android SDK](http://developer.android.com/sdk/index.html) and the [Android NDK](http://developer.android.com/tools/sdk/ndk/index.html) r8b +to be installed in your development environment. + +In addition you'll need ant/bin, android/tools, 'platforms-tools' and 'android-ndk-r8b' in your enviroment path. + +After satisfying those requirements, the build is pretty simple: + +* Run `./compile.sh` from the project directory to build the APK only + +You might find that your device doesn't let you install your build if you +already have the version from the Android Market installed. This is standard +Android security as it it won't let you directly replace an app that's been +signed with a different key. Manually uninstall Bitmask Android from your device and +you will then be able to install your own built version. +To uninstall it, do: adb uninstall se.leap.bitmaskclient + +See [here](https://github.com/leapcode/bitmask_android/blob/master/Building_from_eclipse.txt) for +instructions on building from [Eclipse](http://eclipse.org). + +## Acknowledgements + +This project uses code from [ics-openvpn project](https://code.google.com/p/ics-openvpn/). + +## Contributing + +Please fork this repository and contribute back using +[pull requests](https://github.com/leapcode/leap_android/pulls). + +Any contributions, large or small, major features, bug fixes, additional +language translations, unit/integration tests are welcomed and appreciated +but will be thoroughly reviewed and discussed. diff --git a/compile-with-ndk.sh b/compile-native-openvpn.sh index f938afbf..7b512631 100755 --- a/compile-with-ndk.sh +++ b/compile-native-openvpn.sh @@ -2,8 +2,6 @@ function compile() { svn co http://google-breakpad.googlecode.com/svn/trunk/ google-breakpad ./build-native.sh - android update project --path . --name "LEAP Android" --target android-16 - ant debug } if command -v $(head -n 1 build-native.sh | column | cut -d ' ' -f 1); then @@ -1,3 +1,11 @@ #!/bin/bash +libopenvpn_so_files=`find libs -name libopenvpn.so | wc --lines` +libopvnutil_so_files=`find libs -name libopvpnutil.so | wc --lines` +minivpn_files=`find libs -name minivpn | wc --lines` +if [ $libopenvpn_so_files -lt 4 ] || [ $libopvnutil_so_files -lt 4 ] || [ $minivpn_files -lt 4 ]; +then + ./compile-native-openvpn.sh +fi + android update project --path . --name "Bitmask for Android" --target android-15 ant debug |