Android: Update docs to use generated apk wrapper scripts
BUG=674250
Change-Id: I336a67f3d528c52ec1d92dd18efd33f4efca84a7
Reviewed-on: https://chromium-review.googlesource.com/586471
Reviewed-by: Tommy Nyquist <[email protected]>
Commit-Queue: Tommy Nyquist <[email protected]>
Cr-Commit-Position: refs/heads/master@{#489692}
diff --git a/docs/android_debugging_instructions.md b/docs/android_debugging_instructions.md
index 3c4eba2a..705b538 100644
--- a/docs/android_debugging_instructions.md
+++ b/docs/android_debugging_instructions.md
@@ -5,27 +5,13 @@
[TOC]
-## Setting up command line flags
-
-Various commands below requires setting up command line flags.
-
-```shell
-# Content shell
-build/android/adb_content_shell_command_line --flags --to-pass
-# Chromium test shell
-build/android/adb_chrome_shell_command_line --flags --to-pass
-```
-
## Launching the app
-You can launch the app by using one of the wrappers. You can pass URLs directly
-too.
+You can launch the app by using one of the wrappers.
```shell
-# Content shell
-build/android/adb_run_content_shell 'data:text/html;utf-8,<html>Hello World!</html>'
-# Chromium test shell
-build/android/adb_run_chrome_shell 'data:text/html;utf-8,<html>Hello World!</html>'
+out/Default/bin/content_shell_apk launch [--args='--foo --bar'] 'data:text/html;utf-8,<html>Hello World!</html>'
+out/Default/bin/chrome_public_apk launch [--args='--foo --bar'] 'data:text/html;utf-8,<html>Hello World!</html>'
```
## Log output
@@ -37,6 +23,8 @@
```shell
adb logcat chromium:V cr.SomeComponent:V *:W
+# or:
+out/Default/bin/chrome_public_apk logcat
```
### Warnings for Blink developers
@@ -126,24 +114,20 @@
Under `build/android`, there are a few scripts:
```shell
-# Convenient wrappers
-build/android/adb_gdb_content_shell
-build/android/adb_gdb_chrome_shell
-
-# Underlying script, try --help for comprehensive list of options
-build/android/adb_gdb
+out/Default/bin/content_shell_apk gdb
+out/Default/bin/chrome_public_apk gdb
```
By default, these wrappers will attach to the browser process.
-You can also attach to the renderer process by using `--sandboxed`. (You might
-need to be root on the phone for that. Run `adb root` if needed)
+You can also attach to the renderer process by using `--args='--sandboxed'`.
+You might need to be root on the phone for that. Run `adb root` if needed)
## Waiting for Debugger on Early Startup
Set the target command line flag with `--wait-for-debugger`.
-Launch the debugger using one of the `adb_gdb` scripts from above.
+Launch the debugger using one of the scripts from above.
Type `info threads` and look for a line like: