Side by Side Diff: README.md
Issue 29433651:
Issue 5219 - Update README.md (Closed)
Patch Set: Ajustments related to Felix's comments
Created May 26, 2017, 1:32 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 Adblock Plus for Samsung Internet | 1 Adblock Plus for Samsung Internet |
| 2 ================================= | 2 ================================= |
| 3 | 3 |
| 4 A content blocker application that serves our filter lists to Samsung's | 4 A content blocker application that serves our filter lists to Samsung's |
| 5 content blocker enabled internet browser. | 5 content blocker enabled internet browser. |
| 6 | 6 |
| 7 | 7 |
| 8 Building with Ant | 8 Building with Gradle |
| 9 ----------------- | 9 -------------------- |
| 10 | 10 |
| 11 #### Requirements | 11 #### Requirements |
| 12 | 12 |
| 13 - [Android SDK][1] | 13 - [Android SDK][1] |
| 14 - [Ant][2] | 14 - Android Build Tools 25.0.3 * |
| 15 - JDK 7 or above | |
| 15 | 16 |
| 16 Just type `ant` inside the `adblockplussbrowser` folder to get a list of | 17 \* Edit `buildToolsVersion` in the root `build.gradle` to change the Build Tools version, if necessary. |
| 17 available build options. | |
| 18 | 18 |
| 19 #### Building | |
| 20 | |
| 21 - In the root dir, create a `local.properties` file and set the `sdk.dir=/your/p ath/here` | |
| 22 - From the root dir, run `./gradlew assembleDebug`. This will generate an .apk f ile in the `adblockplussbrowser/adblockplussbrowser/build/outputs/apk` dir. | |
| 23 | |
| 24 Importing into Android Studio | |
| 25 ----------------------------- | |
| 26 | |
| 27 #### Requirements | |
| 28 | |
| 29 - [Android SDK][1] | |
| 30 - [Android Studio][2] | |
| 31 - Android Build Tools 25.0.3 * | |
| 32 - We're compiling against Android API 25, so make sure you have that one | |
| 33 installed. | |
| 34 - JDK 7 or above | |
| 35 | |
| 36 \* Edit `buildToolsVersion` in the root `build.gradle` to change the Build Tools version, if necessary. | |
| 37 | |
| 38 #### Importing | |
| 39 | |
| 40 Open Android Studio and select *Open an existing Android Studio Project*, then n avigate to the `adblockplussbrowser` dir. | |
| 19 | 41 |
| 20 Importing into Eclipse | 42 Importing into Eclipse |
| 21 ---------------------- | 43 ---------------------- |
| 22 | 44 |
| 23 #### Requirements | 45 #### Requirements |
| 24 | 46 |
| 25 - [Android SDK][1] | 47 - [Android SDK][1] |
| 26 - [Eclipse][3] | 48 - [Eclipse][3] |
| 27 - ADT (Android Developer Tools), available via *Eclipse Marketplace* | 49 - ADT (Android Developer Tools), available via *Eclipse Marketplace* |
| 28 | 50 - We're compiling against Android API 25, so make sure you have that API |
| 29 We're compiling against Android API 23, so make sure you have that one | 51 installed. |
| 30 installed. | 52 - JDK 7 or above |
| 31 | 53 |
| 32 #### Importing | 54 #### Importing |
| 33 | 55 |
| 34 Choose *File*->*New*->*Other*->*Android*->*Android Project from Existing Code*, | 56 Choose *File*->*New*->*Other*->*Android*->*Android Project from Existing Code*, |
| 35 then navigate to the `adblockplussbrowser` folder. | 57 then navigate to the `adblockplussbrowser/adblockplussbrowser` dir. |
| 36 | 58 |
| 37 | 59 |
| 38 Testing | 60 Testing |
| 39 ------- | 61 ------- |
| 40 | 62 |
| 41 To test the whole functionality of the application you will need a Samsung | 63 To test the whole functionality of the application you will need a Samsung |
| 42 Android device with the latest official Android Marshmallow release. | 64 Android device with Android 5.0+ (Lollipop) and Samsung Internet 4.0+. |
| 43 | 65 |
| 44 Emulators won't help you here unfortunately. | 66 Emulators won't help you here, unfortunately. |
| 45 | 67 |
| 46 | 68 |
| 47 [1]: http://developer.android.com/sdk/ | 69 [1]: http://developer.android.com/sdk/ |
| 48 [2]: https://ant.apache.org/ | 70 [2]: https://developer.android.com/studio/index.html |
| 49 [3]: https://eclipse.org/ | 71 [3]: https://eclipse.org/ |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
