| Index: README.md |
| diff --git a/README.md b/README.md |
| index 0de7f900dd8efb2c356f19f04b5947c1b4b44563..e4bd1458fc432e0a4232b6383de3b1c9224c3636 100644 |
| --- a/README.md |
| +++ b/README.md |
| @@ -15,51 +15,7 @@ To update those, call: |
| An Android library that provides the core functionality of Adblock Plus. |
| You can find it in the 'libadblockplus-android' directory. |
| -### Building with Ant |
| - |
| -#### Requirements |
| - |
| -* [The Android SDK](http://developer.android.com/sdk) |
| -* [The Android NDK, 12b](https://developer.android.com/tools/sdk/ndk) |
| -* [Ant](http://ant.apache.org) |
| - |
| -#### Building |
| - |
| -In the 'libadblockplus-android' directory create the file _local.properties_ and set |
| -_sdk.dir_ and _ndk.dir_ to where you installed it, e.g.: |
| - |
| - sdk.dir = /some/where/sdk |
| - ndk.dir = /some/where/ndk |
| - |
| -Then run: |
| - |
| - ant debug |
| - |
| -### Building with Maven |
| - |
| -#### Requirements |
| - |
| -All 'Building with Ant' requirements and additional requirements: |
| - |
| -* [Maven](https://maven.apache.org) |
| - |
| -#### Building |
| - |
| -Go to android sdk directory '/platforms/android-21' and run: |
| - |
| - mvn install:install-file -Dfile=./android.jar -DgroupId=com.google.android -DartifactId=android |
| - -Dversion=5.0 -Dpackaging=jar -DgeneratePom=true |
| - |
| -Set environment variable ANDROID_HOME to your Android SDK directory or pass it in command-line (below). |
| -In the root directory run: |
| - |
| - mvn clean install [-Dandroid.sdk.path=/some/where/sdk] |
| - |
| -This will generate *.aar library artifacts in the 'libadblockplus-android/target', |
| -'libadblockplus-android-settings/target', 'libadblockplus-android-webview/target' directories |
| -and *.apk in the 'libadblockplus-android-webviewapp/target' directory. |
| - |
| -### Building with Gradle/Android Studio |
| +### Building |
| #### Requirements |
| @@ -112,7 +68,7 @@ Put prebuilt shared V8 library file(s) in ARCH directories and set `SHARED_V8_LI |
| environment variable before building. You can pass multiple filenames, separated with space. |
| Libadblockplus is required to be linked with that library file(s). |
| -For example (build with Gradle): |
| +For example: |
| SHARED_V8_LIB_FILENAMES=libv8.cr.so ./gradlew clean assemble |
| @@ -159,44 +115,7 @@ You can find them in the 'libadblockplus-android-tests' directory. |
| Make sure _Library_ requirements are present. |
| -### Building with Ant |
| - |
| -Set ANDROID_HOME environment variable to your Android SDK directory. |
| - |
| -In the 'libadblockplus-android-tests' directory run: |
| - |
| - ant instrument |
| - |
| -### Testing with Ant |
| - |
| -1. Connect an Android device or start the Android Emulator. |
| -2. In the 'libadblockplus-android-tests' directory run: |
| - |
| - ant instrument install test |
| - |
| -to build instrumentation tests app and perform testing or run: |
| - |
| - ant test |
| - |
| -to run installed instrumentation tests app. |
| - |
| -To run specific **test** run: |
| - |
| - ant testOnly -DtestClass=full.test.class.name |
| - |
| -For example: |
| - |
| - ant testOnly -DtestClass=org.adblockplus.libadblockplus.tests.NotificationTest |
| - |
| -To run specific **test method** run: |
| - |
| - ant testOnly -DtestClass=full.test.class.name#testMethod |
| - |
| -For example: |
| - |
| - ant testOnly -DtestClass=org.adblockplus.libadblockplus.tests.NotificationTest#testAddNotification |
| - |
| -### Building with Gradle/Android Studio |
| +### Building |
| Make sure you've created the _local.properties_ file to build the library (see above). |
| In the project root directory run: |
| @@ -205,7 +124,7 @@ In the project root directory run: |
| This will generate *.apk in the 'libadblockplus-android-tests/build/outputs/apk/' directory. |
| -### Testing with Gradle/Android Studio |
| +### Testing |
| You can select test class/method and click 'Run ..Test'. The library and test app will be |
| compiled, installed to emulator/device and launched automatically. |
| @@ -259,20 +178,6 @@ Insert `GeneralSettingsFragment` fragment instance in runtime to start showing s |
| ### Building |
| -#### Building with Ant |
| - |
| -In the 'libadblockplus-android-settings' directory create the file _local.properties_ and set |
| -_sdk.dir_ to where you installed it, e.g.: |
| - |
| - sdk.dir = /some/where/sdk |
| - |
| -Then run: |
| - |
| - ant debug |
| - |
| - |
| -#### Building with Gradle |
| - |
| In the project root directory run: |
| ./gradlew assemble |
| @@ -315,20 +220,6 @@ Note it can be invoked from background thread. |
| ### Building |
| -#### Building with Ant |
| - |
| -In the 'libadblockplus-android-webview' directory create the file _local.properties_ and set |
| -_sdk.dir_ to where you installed it, e.g.: |
| - |
| - sdk.dir = /some/where/sdk |
| - |
| -Then run: |
| - |
| - ant debug |
| - |
| - |
| -#### Building with Gradle |
| - |
| In the project root directory run: |
| ./gradlew assemble |
| @@ -344,21 +235,6 @@ You can find it in the 'libadblockplus-android-webviewapp' directory. |
| Make sure _Library_ requirements are present. |
| -#### Building with Ant |
| - |
| -In the 'libadblockplus-android-webviewapp' directory create the file _local.properties_ and set |
| -_sdk.dir_ to where you installed it, e.g.: |
| - |
| - sdk.dir = /some/where/sdk |
| - |
| -Then run: |
| - |
| - ant debug |
| - |
| -This will generate *.apk in the 'libadblockplus-android-webviewapp/bin/' directory. |
| - |
| -#### Building with Gradle |
| - |
| In the project root directory run: |
| ./gradlew assemble |