summaryrefslogtreecommitdiff
path: root/README.txt
diff options
context:
space:
mode:
Diffstat (limited to 'README.txt')
-rw-r--r--README.txt14
1 files changed, 5 insertions, 9 deletions
diff --git a/README.txt b/README.txt
index 4e1f0db0..1246e5e7 100644
--- a/README.txt
+++ b/README.txt
@@ -11,17 +11,13 @@ Preconditions
Instructions to compile
-----------------------
-1. cd $PROJECT_LOCATION/leap_android
+1. cd $PROJECT_LOCATION/bitmask_android
2. ./compile.sh
Postconditions
--------------
-<<<<<<< HEAD
-1. $PROJECT_LOCATION/leap_android/bin/Bitmask Android-debug.apk exists
-=======
-1. $PROJECT_LOCATION/leap_android/bin/Bitmask for Android-debug.apk exists
->>>>>>> Changed some documentation and scripts.
+1. $PROJECT_LOCATION/bitmask_android/bin/Bitmask for Android-debug.apk exists
Running on the emulator
=========================
@@ -36,7 +32,7 @@ Preconditions
Instructions to run on the emulator
-----------------------------------
-1. cd $PROJECT_LOCATION/leap_android
+1. cd $PROJECT_LOCATION/bitmask_android
1. Run script: ./run.sh @AVD-NAME . (avd names are the names of the files in ~/.android/avd with extension .avd).
Postconditions
@@ -51,14 +47,14 @@ Preconditions
-----------------
1. Android SDK is installed, and its tools are in the PATH.
-2. Bitmask for Android has been compiled.
+2. Bitmask for Android has been compiled in the debugging machine.
3. An avd exists in ~/.android/avd/ (if you do not have one, follow instructions from http://developer.android.com/tools/devices/managing-avds-cmdline.html).
4. jdb is installed (this program is part of OpenJDK 7)
Instructions to debug from the console
-----------------------------------
-1. cd $PROJECT_LOCATION/leap_android
+1. cd $PROJECT_LOCATION/bitmask_android
2. Run script: ./debug.sh @AVD-NAME . (avd names are the names of the files in ~/.android/avd with extension .avd).
Postconditions