| OLD | NEW |
| 1 Mojo | 1 Mojo |
| 2 ==== | 2 ==== |
| 3 | 3 |
| 4 Mojo is an effort to extract a common platform out of Chrome's renderer and | 4 Mojo is an effort to extract a common platform out of Chrome's renderer and |
| 5 plugin processes that can support multiple types of sandboxed content, such as | 5 plugin processes that can support multiple types of sandboxed content, such as |
| 6 HTML, Pepper, or NaCl. | 6 HTML, Pepper, or NaCl. |
| 7 | 7 |
| 8 ## Set-up and code check-out | 8 ## Set-up and code check-out |
| 9 | 9 |
| 10 The instructions below only need to be done once. Note that a simple "git clone" | 10 The instructions below only need to be done once. Note that a simple "git clone" |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 197 | 197 |
| 198 By default, `mojo_run` uses mojo:kiosk_wm as the window | 198 By default, `mojo_run` uses mojo:kiosk_wm as the window |
| 199 manager. You can pass a different window manager url using the | 199 manager. You can pass a different window manager url using the |
| 200 `--window-manager` flag to override this. | 200 `--window-manager` flag to override this. |
| 201 | 201 |
| 202 For additional information on `mojo_run` refer to the built-in help and the | 202 For additional information on `mojo_run` refer to the built-in help and the |
| 203 [documentation](mojo/devtools/common/docs/mojo_run.md). | 203 [documentation](mojo/devtools/common/docs/mojo_run.md). |
| 204 You can also request more information on what the tool is doing for you by | 204 You can also request more information on what the tool is doing for you by |
| 205 passing the `--verbose` flag. | 205 passing the `--verbose` flag. |
| 206 | 206 |
| 207 ### Running a Sky app |
| 208 |
| 209 To run a **local build** of Sky with a **local build** of Mojo, follow steps |
| 210 described in the [sky config file](mojo/tools/configs/sky). Note that the |
| 211 version of Sky has to be compatible with the version of Mojo for this to work. |
| 212 |
| 207 ### <a name="debugging"></a>Debugging, tracing, profiling | 213 ### <a name="debugging"></a>Debugging, tracing, profiling |
| 208 | 214 |
| 209 Devtools `mojo_debug` allows you to interactively inspect a running shell, | 215 Devtools `mojo_debug` allows you to interactively inspect a running shell, |
| 210 collect performance traces and attach a gdb debugger. | 216 collect performance traces and attach a gdb debugger. |
| 211 | 217 |
| 212 For additional information refer to the built-in help and the | 218 For additional information refer to the built-in help and the |
| 213 [documentation](mojo/devtools/common/docs/mojo_debug.md). | 219 [documentation](mojo/devtools/common/docs/mojo_debug.md). |
| 214 | 220 |
| 215 ### Android set-up | 221 ### Android set-up |
| 216 | 222 |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 making your first change: [C++ in Chromium | 289 making your first change: [C++ in Chromium |
| 284 101](http://dev.chromium.org/developers/cpp-in-chromium-101-codelab). | 290 101](http://dev.chromium.org/developers/cpp-in-chromium-101-codelab). |
| 285 | 291 |
| 286 To land a change after receiving LGTM: | 292 To land a change after receiving LGTM: |
| 287 ``` | 293 ``` |
| 288 $ git cl land | 294 $ git cl land |
| 289 ``` | 295 ``` |
| 290 | 296 |
| 291 Don't break the build! Waterfall is here: | 297 Don't break the build! Waterfall is here: |
| 292 http://build.chromium.org/p/client.mojo/waterfall | 298 http://build.chromium.org/p/client.mojo/waterfall |
| OLD | NEW |