diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-04-09 17:07:48 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-04-09 17:15:17 +0200 |
| commit | 51ff5a18f1f074e27e97d822745551a7e8fa068d (patch) | |
| tree | 402e7dd42778a218635bb29a4c2dff93ea7f6525 /README.md | |
| parent | 910b0e1746ab3f63e63808b198ad51fec5b635e5 (diff) | |
| parent | b5ba0abc1610dd4bf573ebcabc5e8f6ab0c9528f (diff) | |
Merge branch 'feature/implement-gradle-build-system-#4676' into develop
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 22 |
1 files changed, 8 insertions, 14 deletions
@@ -11,28 +11,22 @@ report any bugs or feature requests and to see the list of known issues. ## Building -The build requires [Ant](https://ant.apache.org/) v1.6+, the [Android SDK](http://developer.android.com/sdk/index.html) API 17 and the [Android NDK](http://developer.android.com/tools/sdk/ndk/index.html) r8b -to be installed in your development environment. +The build requires the [Android SDK](http://developer.android.com/sdk/index.html) API 17 and the [Android NDK](http://developer.android.com/tools/sdk/ndk/index.html) r9d +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. +In addition you'll need ant/bin, android/tools, 'platforms-tools' and 'android-ndk-r9d' in your enviroment path. -After satisfying those requirements, the build is pretty simple: +### Command line -* Run `./compile.sh` from the project directory to build the APK only +* ./gradlew build -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 +### Android Studio -See [here](https://github.com/leapcode/bitmask_android/blob/develop/Building_from_eclipse.md) for -instructions on building from [Eclipse](http://eclipse.org). +* Import project => select bitmask_android top folder ## Acknowledgements -This project uses code from [ics-openvpn project](https://code.google.com/p/ics-openvpn/). +This project bases its work in [ics-openvpn project](https://code.google.com/p/ics-openvpn/). ## Contributing |