| Index: README.md |
| =================================================================== |
| --- a/README.md |
| +++ b/README.md |
| @@ -1,49 +1,75 @@ |
| Adblock Plus for Samsung Internet |
| ================================= |
| A content blocker application that serves our filter lists to Samsung's |
| content blocker enabled internet browser. |
| -Building with Ant |
| ------------------ |
| +Building with Gradle |
| +-------------------- |
| #### Requirements |
| - [Android SDK][1] |
| -- [Ant][2] |
| +- Android Build Tools 25.0.3 * |
| +- JDK 7 or above |
| -Just type `ant` inside the `adblockplussbrowser` folder to get a list of |
| -available build options. |
| +\* Edit `buildToolsVersion` in the root `build.gradle` to change the Build Tools version, if necessary. |
| +#### Building |
| + |
| +- In the root dir, create a `local.properties` file and set the `sdk.dir=/your/path/here` |
| +- From the root dir, run `./gradlew assembleDebug`. This will generate an .apk file in the `adblockplussbrowser/adblockplussbrowser/build/outputs/apk` dir. |
| + |
| +Importing into Android Studio |
| +----------------------------- |
| + |
| +#### Requirements |
| + |
| +- [Android SDK][1] |
| +- [Android Studio][3] |
| +- Android Build Tools 25.0.3 * |
| +- JDK 7 or above |
| + |
| +\* Edit `buildToolsVersion` in the root `build.gradle` to change the Build Tools version, if necessary. |
| + |
| +We're compiling against Android API 25, so make sure you have that one |
|
Felix Dahlke
2017/05/23 11:16:27
I suggest we add this as a requirement (here, for
diegocarloslima
2017/05/23 12:07:12
Acknowledged.
|
| +installed. |
| + |
| + |
| +#### Importing |
| + |
| +Open Android Studio and select *Open an existing Android Studio Project*, then navigate to the `adblockplussbrowser` dir. |
| Importing into Eclipse |
| ---------------------- |
| #### Requirements |
| - [Android SDK][1] |
| -- [Eclipse][3] |
| +- [Eclipse][4] |
| - ADT (Android Developer Tools), available via *Eclipse Marketplace* |
| +- JDK 7 or above |
| -We're compiling against Android API 23, so make sure you have that one |
| +We're compiling against Android API 25, so make sure you have that API |
| installed. |
| #### Importing |
| Choose *File*->*New*->*Other*->*Android*->*Android Project from Existing Code*, |
| -then navigate to the `adblockplussbrowser` folder. |
| +then navigate to the `adblockplussbrowser/adblockplussbrowser` dir. |
| Testing |
| ------- |
| To test the whole functionality of the application you will need a Samsung |
| -Android device with the latest official Android Marshmallow release. |
| +Android device with Android 5.0+ (Lollipop) and Samsung Internet 4.0+. |
| -Emulators won't help you here unfortunately. |
| +Emulators won't help you here, unfortunately. |
| [1]: http://developer.android.com/sdk/ |
| [2]: https://ant.apache.org/ |
|
Felix Dahlke
2017/05/23 11:16:27
Seems like this link is not used anymore, so it ca
diegocarloslima
2017/05/23 12:07:12
Acknowledged.
|
| -[3]: https://eclipse.org/ |
| +[3]: https://developer.android.com/studio/index.html |
| +[4]: https://eclipse.org/ |