| OLD | NEW |
| 1 Adblock Plus for Android | 1 Adblock Plus for Android |
| 2 ======================== | 2 ======================== |
| 3 | 3 |
| 4 An Android app that runs a proxy to block ads. | 4 An Android app that runs a proxy to block ads. |
| 5 | 5 |
| 6 Updating the dependencies | 6 Updating the dependencies |
| 7 ------------------------- | 7 ------------------------- |
| 8 | 8 |
| 9 Adblock Plus for Android has dependencies that aren't in this repository. | 9 Adblock Plus for Android has dependencies that aren't in this repository. |
| 10 To update those, call: | 10 To update those, call: |
| 11 | 11 |
| 12 ./ensure_dependencies.py | 12 ./ensure_dependencies.py |
| 13 | 13 |
| 14 Buildling with Ant | 14 Buildling with Ant |
| 15 ------------------ | 15 ------------------ |
| 16 | 16 |
| 17 ### Requirements | 17 ### Requirements |
| 18 | 18 |
| 19 - [The Android SDK](http://developer.android.com/sdk) | 19 - [The Android SDK](http://developer.android.com/sdk) |
| 20 - [The Android NDK](https://developer.android.com/tools/sdk/ndk) | 20 - [The Android NDK](https://developer.android.com/tools/sdk/ndk) |
| 21 - [Ant](http://ant.apache.org) | 21 - [Ant](http://ant.apache.org) |
| 22 | 22 |
| 23 ### Building | 23 ### Building |
| 24 | 24 |
| 25 In the project directory, create the file _local.properties_ and set | 25 In the project directory and in /submodules/libadblockplus-android/libadblockplu
s-android |
| 26 _sdk.dir_ and _ndk.dir_ to where you installed it, e.g.: | 26 create the file _local.properties_ and set _sdk.dir_ and _ndk.dir_ to where you
installed them, |
| 27 e.g.: |
| 27 | 28 |
| 28 sdk.dir = /some/where/sdk | 29 sdk.dir = /some/where/sdk |
| 29 ndk.dir = /some/where/ndk | 30 ndk.dir = /some/where/ndk |
| 30 | 31 |
| 31 Then run: | 32 Then run: |
| 32 | 33 |
| 33 ant debug | 34 ant debug |
| 34 | 35 |
| 35 ### Running | 36 ### Running |
| 36 | 37 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 57 2. Select _Import_ in the _File_ menu, then _Existing Android Projects Into Work
space_. | 58 2. Select _Import_ in the _File_ menu, then _Existing Android Projects Into Work
space_. |
| 58 3. Select the project directory (_adblockplusandroid_) as _Root Directory_. | 59 3. Select the project directory (_adblockplusandroid_) as _Root Directory_. |
| 59 4. Select the projects _Adblock Plus_, _library_ and _android-switch-backport_. | 60 4. Select the projects _Adblock Plus_, _library_ and _android-switch-backport_. |
| 60 5. Revert any local changes to _.classpath_ in _adblockplusandroid_ | 61 5. Revert any local changes to _.classpath_ in _adblockplusandroid_ |
| 61 and _adblockplusandroid/submodules/android-switch-backport_. | 62 and _adblockplusandroid/submodules/android-switch-backport_. |
| 62 | 63 |
| 63 ### Running | 64 ### Running |
| 64 | 65 |
| 65 1. Connect an Android device or start the Android Emulator. | 66 1. Connect an Android device or start the Android Emulator. |
| 66 2. In Eclipse, select the _Adblock Plus_ project, then run it as an | 67 2. In Eclipse, select the _Adblock Plus_ project, then run it as an |
| 67 _Android Application_. | 68 _Android Application_. |
| OLD | NEW |