| OLD | NEW |
| 1 Adblock Plus Library for Android | 1 Adblock Plus Library for Android |
| 2 ================================ | 2 ================================ |
| 3 | 3 |
| 4 An Android library project, tests and demo application for AdblockWebView widget
. | 4 An Android library project, tests and demo application for AdblockWebView widget
. |
| 5 | 5 |
| 6 ## Updating the dependencies | 6 ## Updating the dependencies |
| 7 | 7 |
| 8 Adblock Plus for Android has dependencies that aren't in this repository. | 8 Adblock Plus for Android has dependencies that aren't in this repository. |
| 9 To update those, call: | 9 To update those, call: |
| 10 | 10 |
| 11 ./ensure_dependencies.py | 11 ./ensure_dependencies.py |
| 12 | 12 |
| 13 ## Library | 13 ## Library |
| 14 | 14 |
| 15 An Android library that provides the core functionality of Adblock Plus. | 15 An Android library that provides the core functionality of Adblock Plus. |
| 16 You can find it in the 'libadblockplus-android' directory. | 16 You can find it in the 'libadblockplus-android' directory. |
| 17 | 17 |
| 18 ### Building with Ant | 18 ### Building with Ant |
| 19 | 19 |
| 20 #### Requirements | 20 #### Requirements |
| 21 | 21 |
| 22 * [The Android SDK](http://developer.android.com/sdk) | 22 * [The Android SDK](http://developer.android.com/sdk) |
| 23 * [The Android NDK](https://developer.android.com/tools/sdk/ndk) | 23 * [The Android NDK, 12b](https://developer.android.com/tools/sdk/ndk) |
| 24 * [Ant](http://ant.apache.org) | 24 * [Ant](http://ant.apache.org) |
| 25 | 25 |
| 26 #### Building | 26 #### Building |
| 27 | 27 |
| 28 In the 'libadblockplus-android' directory create the file _local.properties_ and
set | 28 In the 'libadblockplus-android' directory create the file _local.properties_ and
set |
| 29 _sdk.dir_ and _ndk.dir_ to where you installed it, e.g.: | 29 _sdk.dir_ and _ndk.dir_ to where you installed it, e.g.: |
| 30 | 30 |
| 31 sdk.dir = /some/where/sdk | 31 sdk.dir = /some/where/sdk |
| 32 ndk.dir = /some/where/ndk | 32 ndk.dir = /some/where/ndk |
| 33 | 33 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 58 This will generate *.aar library artifacts in the 'libadblockplus-android/target
', | 58 This will generate *.aar library artifacts in the 'libadblockplus-android/target
', |
| 59 'libadblockplus-android-settings/target', 'libadblockplus-android-webview/target
' directories | 59 'libadblockplus-android-settings/target', 'libadblockplus-android-webview/target
' directories |
| 60 and *.apk in the 'libadblockplus-android-webviewapp/target' directory. | 60 and *.apk in the 'libadblockplus-android-webviewapp/target' directory. |
| 61 | 61 |
| 62 ### Building with Gradle/Android Studio | 62 ### Building with Gradle/Android Studio |
| 63 | 63 |
| 64 #### Requirements | 64 #### Requirements |
| 65 | 65 |
| 66 * [The Android SDK](http://developer.android.com/sdk) | 66 * [The Android SDK](http://developer.android.com/sdk) |
| 67 * Android SDK Build tools 24.0.1 | 67 * Android SDK Build tools 24.0.1 |
| 68 * [The Android NDK](https://developer.android.com/tools/sdk/ndk) | 68 * [The Android NDK, 12b](https://developer.android.com/tools/sdk/ndk) |
| 69 | 69 |
| 70 Edit 'buildToolsVersion' in 'build.gradle' files if necessary. | 70 Edit 'buildToolsVersion' in 'build.gradle' files if necessary. |
| 71 | 71 |
| 72 #### Building from command-line | 72 #### Building from command-line |
| 73 | 73 |
| 74 In the project root directory create the file _local.properties_ and set | 74 In the project root directory create the file _local.properties_ and set |
| 75 _sdk.dir_ and _ndk.dir_ to where you installed it, e.g.: | 75 _sdk.dir_ and _ndk.dir_ to where you installed it, e.g.: |
| 76 | 76 |
| 77 sdk.dir = /some/where/sdk | 77 sdk.dir = /some/where/sdk |
| 78 ndk.dir = /some/where/ndk | 78 ndk.dir = /some/where/ndk |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 298 | 298 |
| 299 This will generate *.apk in the 'libadblockplus-android-webviewapp/bin/' directo
ry. | 299 This will generate *.apk in the 'libadblockplus-android-webviewapp/bin/' directo
ry. |
| 300 | 300 |
| 301 #### Building with Gradle | 301 #### Building with Gradle |
| 302 | 302 |
| 303 In the project root directory run: | 303 In the project root directory run: |
| 304 | 304 |
| 305 ./gradlew assemble | 305 ./gradlew assemble |
| 306 | 306 |
| 307 This will generate *.apk in the 'libadblockplus-android-webviewapp/build/outputs
/apk/' directory. | 307 This will generate *.apk in the 'libadblockplus-android-webviewapp/build/outputs
/apk/' directory. |
| OLD | NEW |