From 013cff913a7ba73cb5d338848ebdb639ddcabaed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Sat, 6 Feb 2016 11:50:21 +0100 Subject: Init ics-openvpn submodules --- README.md | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index f1921e10..07562089 100644 --- a/README.md +++ b/README.md @@ -28,14 +28,23 @@ Installable via `android` command (SDK Manager): * Android SDK Build-tools, 19.0.3 * Android Support Repository, 4+ -We need Mercurial: -* Mercurial: http://mercurial.selenic.com/downloads - Finally, install a java compiler. For example: sudo apt-get install default-jdk -### Build native sources +## Update git submodules + +We build upon ics-openvpn, which meets a submodule in our project structure. + +For that reason, it is necessary to initialize and update them before being able to build Bitmask Android. + + git submodule init + git submodule update + cd ics-openvpn + git submodule init + git submodule update + +## Build native sources To build NDK sources, you need to issue these commands: -- cgit v1.2.3 From 096faf08f2d0cc4dc4a28677415391942410063d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Sat, 6 Feb 2016 12:42:42 +0100 Subject: Update build tools and compile sdk version. Warn about the needed libraries for 64 bit systems. --- README.md | 3 +++ 1 file changed, 3 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index 07562089..885c415b 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,9 @@ Finally, install a java compiler. For example: sudo apt-get install default-jdk +If you are using a 64-bit machine, you will need to install some libraries too: + sudo apt-get install lib32stdc++6 lib32z1 + ## Update git submodules We build upon ics-openvpn, which meets a submodule in our project structure. -- cgit v1.2.3 From 5b95785060adace6b48a69d560051261233d954d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Sat, 6 Feb 2016 13:00:53 +0100 Subject: Update ics-openvpn --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'README.md') diff --git a/README.md b/README.md index 885c415b..913a70c7 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,18 @@ Due to the nature of some tests, adb will lose its connectivity and you won't re We'll polish this process soon, but right now that's what we're doing (well, in fact, we run "adb logcat" in Emacs and then search "failed: test" in the corresponding buffer ;) ). +## Updating ics-openvpn + + cd ics-openvpn + git remote add upstream https://github.com/schwabe/ics-openvpn.git + git pull --rebase upstream master + +A bunch of conflicts may arise. The guidelines are: + 1. Methods in HEAD (upstream) completely removed from Bitmask should be removed again (e.g. askPW) + 2. Sometimes, Dashboard.class is in Bitmask while in ics-openvpn it is replaced by MainActivity.class and other classes. Keep removing them to keep Dashboard.class in there. + 3. Some resources files are stripped from several entries. Remove them if possible (check the code we compile is not using anything else new). + + ./gradlew updateIcsOpenVpn ## Acknowledgements This project bases its work in [ics-openvpn project](https://code.google.com/p/ics-openvpn/). -- cgit v1.2.3 From 7b03a7275e37c0153852d60247dd1b045f0a3acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Sun, 7 Feb 2016 10:59:43 +0100 Subject: Update README to reflect last versions of Android tools --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'README.md') diff --git a/README.md b/README.md index 913a70c7..d7b4e4ea 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ report any bugs or feature requests and to see the list of known issues. Install from developer.android.com: -* Android SDK, API 17: http://developer.android.com/sdk/index.html -* Android NDK, r9d: http://developer.android.com/tools/sdk/ndk/index.html +* Android SDK, API 23: http://developer.android.com/sdk/index.html +* Android NDK, r10e: http://developer.android.com/tools/sdk/ndk/index.html Make sure add the necessary android tools to your bin path. For example, assuming you installed the SDK and NDK to `~/dev` on a linux machine, you would add this to your path: @@ -25,7 +25,7 @@ the SDK and NDK to `~/dev` on a linux machine, you would add this to your path: Installable via `android` command (SDK Manager): -* Android SDK Build-tools, 19.0.3 +* Android SDK Build-tools, 23.0.2 * Android Support Repository, 4+ Finally, install a java compiler. For example: -- cgit v1.2.3 From 93aca53eae03b4b31877e97991d61bdc11a2db44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Sun, 7 Feb 2016 11:04:21 +0100 Subject: Typo in README, ndk version in PATH addition --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README.md') diff --git a/README.md b/README.md index d7b4e4ea..7fe5d630 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ the SDK and NDK to `~/dev` on a linux machine, you would add this to your path: ~/dev/android-sdk-linux/tools ~/dev/android-sdk-linux/platform-tools - ~/dev/android-ndk-r9d + ~/dev/android-ndk-r10e/ Installable via `android` command (SDK Manager): -- cgit v1.2.3