summaryrefslogtreecommitdiff
path: root/chromium/docs/android_studio.md
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-01-31 16:33:43 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-02-06 16:33:22 +0000
commitda51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch)
tree4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/docs/android_studio.md
parentc8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff)
downloadqtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/docs/android_studio.md')
-rw-r--r--chromium/docs/android_studio.md16
1 files changed, 12 insertions, 4 deletions
diff --git a/chromium/docs/android_studio.md b/chromium/docs/android_studio.md
index 4016e62faed..129d9d26dae 100644
--- a/chromium/docs/android_studio.md
+++ b/chromium/docs/android_studio.md
@@ -17,11 +17,19 @@ This creates a project at `out/Debug/gradle`. To create elsewhere:
build/android/gradle/generate_gradle.py --output-directory out/Debug --project-dir my-project
```
+If you are planning to use Android emulators use the
+--sdk=AndroidStudioDefault or the --sdk-path option, since adding emulator
+images to the project sdk will modify the project sdk, hence causing problems
+when you next run gclient sync.
+
+See [android_test_instructions.md](android_test_instructions.md#Using-Emulators)
+for more information about building and running emulators.
+
For first-time Android Studio users:
-* Avoid running the setup wizard.
- * The wizard will force you to download unwanted SDK components to
- `//third_party/android_tools`.
+* Only run the setup wizard if you are planning to use emulators.
+ * The wizard will force you to download SDK components that are only needed
+ for emulation.
* To skip it, select "Cancel" when it comes up.
To import the project:
@@ -31,7 +39,7 @@ To import the project:
If you're asked to use Studio's Android SDK:
-* No. (Always use project's own SDK)
+* No. (Always use the SDK configured by generate_gradle.py)
If you're asked to use Studio's Gradle wrapper: