Android: Remove mentions of envsetup.sh from docs
Having it listed in the docs implies that running the script is
necessary to have things work; it's not. Also - fewer instructions the
better!
Change-Id: I993821cc6a11267cdc54fa99075ae5979f622520
Reviewed-on: https://chromium-review.googlesource.com/788132
Reviewed-by: John Budorick <[email protected]>
Commit-Queue: agrieve <[email protected]>
Cr-Commit-Position: refs/heads/master@{#518965}diff --git a/docs/profiling_content_shell_on_android.md b/docs/profiling_content_shell_on_android.md
index b7344f2..73df8ff 100644
--- a/docs/profiling_content_shell_on_android.md
+++ b/docs/profiling_content_shell_on_android.md
@@ -13,47 +13,19 @@
## Get and build `content_shell_apk` for Android
-(These instructions have been carefully distilled from the
-[Android Build Instructions](android_build_instructions.md).)
+More detailed insturctions in [android_build_instructions.md](android_build_instructions.md).
-1. Get the code! You’ll want a second checkout as this will be
- Android-specific. You know the drill:
- https://www.chromium.org/developers/how-tos/get-the-code
-1. Append this to your `.gclient` file: `target_os = ['android']`
-1. Create `chromium.gyp_env` next to your `.gclient` file:
- `echo "{ 'GYP_DEFINES': 'OS=android', }" > chromium.gyp_env`
-1. (Note: All these scripts assume you’re using "bash" (default) as your
- shell.)
-1. Sync and runhooks (be careful not to run hooks on the first sync):
-
- ```
- gclient sync --nohooks
- . build/android/envsetup.sh
- gclient runhooks
- ```
-
-1. No need to install any API Keys.
-1. Install Oracle’s Java: http://goo.gl/uPRSq. Grab the appropriate x64 .bin
- file, `chmod +x`, and then execute to extract. You then move that extracted
- tree into /usr/lib/jvm/, rename it java-6-sun and set:
-
- ```
- export JAVA_HOME=/usr/lib/jvm/java-6-sun
- export ANDROID_JAVA_HOME=/usr/lib/jvm/java-6-sun
- ```
-
-1. Type ‘`java -version`’ and make sure it says java version `1.6.0_35` without
- any mention of openjdk before proceeding.
-1. `sudo build/install-build-deps-android.sh`
-1. Time to build!
-
- ```
- ninja -C out/Release content_shell_apk
- ```
+```shell
+ninja -C out/Release content_shell_apk
+```
## Setup the physical device
-Plug in your device. Make sure you can talk to your device, try "`adb shell ls`"
+Plug in your device. Make sure you can talk to your device, try:
+
+```shell
+third_party/android_tools/sdk/platform-tools/adb shell ls
+```
## Root your device and install a userdebug build
@@ -118,23 +90,13 @@
adb sync
adb shell perf top # check that perf can get samples (don’t expect symbols)
-## Install ContentShell
+## Install and Run ContentShell
Install with the following:
- build/android/adb_install_apk.py \
- --apk out/Release/apks/ContentShell.apk \
- --apk_package org.chromium.content_shell
+ out/Release/bin/content_shell_apk run
-## Run ContentShell
-
-Run with the following:
-
- ./build/android/adb_run_content_shell
-
-If `content_shell` “stopped unexpectedly” use `adb logcat` to debug. If you see
-ResourceExtractor exceptions, a clean build is your solution.
-https://crbug.com/164220
+If `content_shell` “stopped unexpectedly” use `adb logcat` to debug.
## Setup a `symbols` directory with symbols from your build (not needed for Telemetry)
@@ -177,7 +139,7 @@
Run the following:
- adb shell ps | grep content (look for the pid of the sandboxed_process)
+ out/Release/content_shell_apk ps (look for the pid of the sandboxed_process)
adb shell perf record -g -p 12345 sleep 5
adb pull /data/perf.data
