android_studio.md: Mention Gradle wrapper, make --canary more prominent
NOTRY=true # Doc change
Change-Id: Ib1f0379d78b2c668fa8b9541f0427fb13eab177e
Reviewed-on: https://chromium-review.googlesource.com/700478
Reviewed-by: Peter Wen <[email protected]>
Commit-Queue: Peter Wen <[email protected]>
Cr-Commit-Position: refs/heads/master@{#506386}diff --git a/docs/android_studio.md b/docs/android_studio.md
index bfc014d..1860d55 100644
--- a/docs/android_studio.md
+++ b/docs/android_studio.md
@@ -8,7 +8,7 @@
[android build instructions](android_build_instructions.md) already.
```shell
-build/android/gradle/generate_gradle.py
+build/android/gradle/generate_gradle.py [--canary] # Use --canary for Android Studio 3.0 beta
```
This creates a project at `out/Debug/gradle`. To create elsewhere:
@@ -36,6 +36,14 @@
* Use "Import Project", and select the directory containing the generated
project, by default `out/Debug/gradle`.
+If you're asked to use Studio's Android SDK:
+
+* No.
+
+If you're asked to use Studio's Gradle wrapper:
+
+* Yes.
+
You need to re-run `generate_gradle.py` whenever `BUILD.gn` files change.
* After regenerating, Android Studio should prompt you to "Sync". If it
@@ -44,10 +52,6 @@
* Help -> Find Action -> "Sync Project with Gradle Files"
* After `gn clean` you may need to restart Android Studio.
-* You can try out Android Studio canary by adding `--canary` to your
- `generate_gradle.py` call, but as it is canary, expect to have to make manual
- adjustments when building/syncing.
-
## How It Works
By default, only a single module is generated. If more than one apk target is
@@ -83,6 +87,7 @@
## Android Studio Tips
+* Using the Java debugger is documented at [android_debugging_instructions.md#android-studio](android_debugging_instructions.md#android-studio).
* Configuration instructions can be found
[here](http://tools.android.com/tech-docs/configuration). One suggestions:
* Launch it with more RAM:
@@ -140,11 +145,11 @@
* Add the line `org.gradle.daemon=true` to `~/.gradle/gradle.properties`,
creating it if necessary.
-## Status (as of April 27th, 2017)
+## Status (as of Oct, 2017)
### What works
-* Android Studio v2.3.
+* Android Studio v2.3, and v3.0 beta with `--canary` flag.
* Java editing and gradle compile.
* Instrumentation tests included as androidTest.
* Symlinks to existing .so files in jniLibs (doesn't generate them).
@@ -158,5 +163,5 @@
* Gradle being aware of assets.
* Layout editor.
-* Add support for native code editing.
-* Make the "Make Project" button work correctly.
+* Native code editing.
+* Having the "Make Project" button work correctly.
