From c165dbd294b470c733a277de8cb3c1eaef3d7b3e Mon Sep 17 00:00:00 2001
From: "smain@google.com"
Date: Wed, 6 Apr 2016 16:12:16 -0700
Subject: [PATCH] add instructions to change Android SDK location when using N
Preview bug: 28017690
Change-Id: I5ac12346bdf8de1c8871d8ad79a7921c22dc4793
---
docs/html/preview/setup-sdk.jd | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/docs/html/preview/setup-sdk.jd b/docs/html/preview/setup-sdk.jd
index bc40ebd44b84f..28c4709a78736 100644
--- a/docs/html/preview/setup-sdk.jd
+++ b/docs/html/preview/setup-sdk.jd
@@ -55,7 +55,7 @@ environment unaffected.
To download Android Studio 2.1 as a separate installation, follow these
steps (or if you want to receive Android Studio 2.1 as an update to your
-existing installation, skip to step 4):
+existing installation, skip to step 6):
- Edit the name of your
@@ -67,6 +67,16 @@ existing installation, skip to step 4):
- Unzip the package and move the Android Studio 2.1 contents to the
appropriate location for applications on your system, then launch it.
+ - In the setup wizard, click Next a couple times to
+ reach the SDK Components Setup screen. Here,
+ you must set a different path for the Android SDK Location.
+ It can be any directory you want, but it must not be the default path, which
+ is the same directory used by your original version of Android Studio (unless
+ you changed that one yourself). The SDK location for Android Studio 2.1
+ must be different because the N Preview SDK packages are not compatible with
+ versions of Android Studio lower than 2.1.
+
+ - Continue with the setup wizard until you reach the Android Studio IDE.
- Open the Settings dialog
(File > Settings on Windows/Linux, or
Android Studio > Preferences on Mac). In the left