| OLD | NEW |
| 1 Adblock Plus Library for Android | 1 Adblock Plus Library for Android |
| 2 ======================== | 2 ======================== |
| 3 | 3 |
| 4 An Android library project that runs a proxy to block ads. | 4 An Android library project that runs a proxy to block ads. |
| 5 | 5 |
| 6 Updating the dependencies | 6 Updating the dependencies |
| 7 ------------------------- | 7 ------------------------- |
| 8 | 8 |
| 9 Adblock Plus Library for Android has dependencies that aren't in this repository
. | 9 Adblock Plus Library 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 ## Library |
| 15 |
| 14 Building with Ant | 16 Building with Ant |
| 15 ------------------ | 17 ------------------ |
| 16 | 18 |
| 17 ### Requirements | 19 ### Requirements |
| 18 | 20 |
| 19 - [The Android SDK](http://developer.android.com/sdk) | 21 * [The Android SDK](http://developer.android.com/sdk) |
| 20 - [The Android NDK](https://developer.android.com/tools/sdk/ndk) | 22 * [The Android NDK](https://developer.android.com/tools/sdk/ndk) |
| 21 - [Ant](http://ant.apache.org) | 23 * [Ant](http://ant.apache.org) |
| 22 | 24 |
| 23 ### Building | 25 ### Building |
| 24 | 26 |
| 25 In the 'libadblockplus-android' directory create the file _local.properties_ and
set | 27 In the 'libadblockplus-android' directory create the file _local.properties_ and
set |
| 26 _sdk.dir_ and _ndk.dir_ to where you installed it, e.g.: | 28 _sdk.dir_ and _ndk.dir_ to where you installed it, e.g.: |
| 27 | 29 |
| 28 sdk.dir = /some/where/sdk | 30 sdk.dir = /some/where/sdk |
| 29 ndk.dir = /some/where/ndk | 31 ndk.dir = /some/where/ndk |
| 30 | 32 |
| 31 Then run: | 33 Then run: |
| 32 | 34 |
| 33 ant debug | 35 ant debug |
| 34 | 36 |
| 35 Building with Maven | 37 Building with Maven |
| 36 ------------------- | 38 ------------------- |
| 37 | 39 |
| 38 ### Requirements | 40 ### Requirements |
| 39 | 41 |
| 40 All 'Building with Ant' requirements and additional requirements: | 42 All 'Building with Ant' requirements and additional requirements: |
| 41 | 43 |
| 42 - [Maven](https://maven.apache.org) | 44 * [Maven](https://maven.apache.org) |
| 43 | 45 |
| 44 ### Building | 46 ### Building |
| 45 | 47 |
| 46 Set environment variable ANDROID_HOME to your Android SDK directory or pass it i
n command-line (below). | 48 Set environment variable ANDROID_HOME to your Android SDK directory or pass it i
n command-line (below). |
| 47 In the 'libadblockplus-android' directory run: | 49 In the 'libadblockplus-android' directory run: |
| 48 | 50 |
| 49 mvn clean install [-Dandroid.sdk.path=/some/where/sdk] | 51 mvn clean install [-Dandroid.sdk.path=/some/where/sdk] |
| 50 | 52 |
| 51 This will generate *.aar library artifact in the 'target' directory. | 53 This will generate *.aar library artifact in the 'target' directory. |
| 54 |
| 55 ## Library tests |
| 56 |
| 57 ### Requirements |
| 58 |
| 59 Make sure _Library_ requirements are present. |
| 60 |
| 61 ### Building |
| 62 |
| 63 Set ANDROID_HOME environment variable to your Android SDK directory. |
| 64 |
| 65 In the 'libadblockplus-android-tests' run: |
| 66 |
| 67 ant instrument |
| 68 |
| 69 ### Testing |
| 70 |
| 71 1. Connect an Android device or start the Android Emulator. |
| 72 2. In the 'libadblockplus-android-tests' directory run: |
| 73 |
| 74 ant instrument install test |
| 75 |
| 76 to build instrumentation tests app and perform testing or run: |
| 77 |
| 78 ant test |
| 79 |
| 80 to run installed instrumentation tests app |
| OLD | NEW |