Merge branch 'feature/update-ics-openvpn' into develop

1 files changed, 15 insertions, 0 deletions

diff --git a/README.md b/README.md
index 07562089..913a70c7 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.
@@ -86,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/).