Skip to content

Commit

Permalink
Update docs for facebook#17747
Browse files Browse the repository at this point in the history
  • Loading branch information
msand committed Jan 26, 2018
1 parent 32926ae commit 7f468c9
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 21 deletions.
4 changes: 2 additions & 2 deletions docs/android-building-from-source.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ <h2><a class="anchor" aria-hidden="true" name="prerequisites"></a><a href="#prer
<p>Assuming you have the Android SDK installed, run <code>android</code> to open the Android SDK Manager.</p>
<p>Make sure you have the following installed:</p>
<ol>
<li>Android SDK version 23 (compileSdkVersion in <a href="https://github.com/facebook/react-native/blob/master/ReactAndroid/build.gradle"><code>build.gradle</code></a>)</li>
<li>SDK build tools version 23.0.1 (buildToolsVersion in <a href="https://github.com/facebook/react-native/blob/master/ReactAndroid/build.gradle"><code>build.gradle</code></a>)</li>
<li>Android SDK version 27 (compileSdkVersion in <a href="https://github.com/facebook/react-native/blob/master/ReactAndroid/build.gradle"><code>build.gradle</code></a>)</li>
<li>SDK build tools version 26.0.2 (buildToolsVersion in <a href="https://github.com/facebook/react-native/blob/master/ReactAndroid/build.gradle"><code>build.gradle</code></a>)</li>
<li>Android Support Repository &gt;= 17 (for Android Support Library)</li>
<li>Android NDK (download links and installation instructions below)</li>
</ol>
Expand Down
14 changes: 6 additions & 8 deletions docs/getting-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ <h4><a class="anchor" aria-hidden="true" name="1-install-android-studio"></a><a
</blockquote>
<p>Once setup has finalized and you're presented with the Welcome screen, proceed to the next step.</p>
<h4><a class="anchor" aria-hidden="true" name="2-install-the-android-sdk"></a><a href="#2-install-the-android-sdk" aria-hidden="true" class="hash-link" ><svg aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>2. Install the Android SDK</h4>
<p>Android Studio installs the latest Android SDK by default. Building a React Native app with native code, however, requires the <code>Android 6.0 (Marshmallow)</code> SDK in particular. Additional Android SDKs can be installed through the SDK Manager in Android Studio.</p>
<p>Android Studio installs the latest Android SDK by default. Additional Android SDKs can be installed through the SDK Manager in Android Studio.</p>
<p>The SDK Manager can be accessed from the &quot;Welcome to Android Studio&quot; screen. Click on &quot;Configure&quot;, then select &quot;SDK Manager&quot;.</p>
<p><block class="native mac android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedAndroidStudioWelcomeMacOS.png" alt="Android Studio Welcome"></p>
Expand All @@ -239,19 +239,17 @@ <h4><a class="anchor" aria-hidden="true" name="2-install-the-android-sdk"></a><a
<blockquote>
<p>The SDK Manager can also be found within the Android Studio &quot;Preferences&quot; dialog, under <strong>Appearance &amp; Behavior</strong><strong>System Settings</strong><strong>Android SDK</strong>.</p>
</blockquote>
<p>Select the &quot;SDK Platforms&quot; tab from within the SDK Manager, then check the box next to &quot;Show Package Details&quot; in the bottom right corner. Look for and expand the <code>Android 6.0 (Marshmallow)</code> entry, then make sure the following items are all checked:</p>
<p>Select the &quot;SDK Platforms&quot; tab from within the SDK Manager, then check the box next to &quot;Show Package Details&quot; in the bottom right corner. Look for and expand the <code>Android 8.0 (Oreo) and API 27</code> entry, then make sure the following items are all checked:</p>
<ul>
<li><code>Google APIs</code></li>
<li><code>Android SDK Platform 23</code></li>
<li><code>Intel x86 Atom_64 System Image</code></li>
<li><code>Google APIs Intel x86 Atom_64 System Image</code></li>
<li><code>Android SDK Platform 27</code></li>
<li><code>Google APIs Intel x86 Atom_64 System Image (or Google APIs Intel x86 Atom System Image)</code></li>
</ul>
<p><block class="native mac android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedAndroidSDKManagerMacOS.png" alt="Android SDK Manager"></p>
<p><block class="native windows android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedAndroidSDKManagerWindows.png" alt="Android SDK Manager"></p>
<p><block class="native windows mac linux android" /></p>
<p>Next, select the &quot;SDK Tools&quot; tab and check the box next to &quot;Show Package Details&quot; here as well. Look for and expand the &quot;Android SDK Build-Tools&quot; entry, then make sure that <code>23.0.1</code> is selected.</p>
<p>Optionally, select the &quot;SDK Tools&quot; tab and check the box next to &quot;Show Package Details&quot; here as well. Look for and expand the &quot;Android SDK Build-Tools&quot; entry, then make sure that <code>26.0.2</code> is selected.</p>
<p><block class="native mac android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedAndroidSDKManagerSDKToolsMacOS.png" alt="Android SDK Manager - 23.0.1 Build Tools"></p>
<p><block class="native windows android" /></p>
Expand Down Expand Up @@ -326,7 +324,7 @@ <h3><a class="anchor" aria-hidden="true" name="using-a-virtual-device"></a><a hr
<p><block class="native mac android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedCreateAVDMacOS.png" alt="Android Studio AVD Manager"></p>
<p><block class="native mac windows linux android" /></p>
<p>Select the &quot;x86 Images&quot; tab, then look for the <strong>Marshmallow</strong> API Level 23, x86_64 ABI image with a Android 6.0 (Google APIs) target.</p>
<p>Select the &quot;x86 Images&quot; tab, then look for the <strong>Android API 27</strong>, x86 ABI, or the <strong>Oreo</strong> API Level 26, x86_64 ABI image with a Android 8.0 (Google APIs) target.</p>
<p><block class="native linux android" /></p>
<blockquote>
<p>We recommend configuring <a href="https://developer.android.com/studio/run/emulator-acceleration.html#vm-linux">VM acceleration</a> on your system to improve performance. Once you've followed those instructions, go back to the AVD Manager.</p>
Expand Down
6 changes: 3 additions & 3 deletions docs/next/android-building-from-source.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ <h2><a class="anchor" aria-hidden="true" name="prerequisites"></a><a href="#prer
<p>Assuming you have the Android SDK installed, run <code>android</code> to open the Android SDK Manager.</p>
<p>Make sure you have the following installed:</p>
<ol>
<li>Android SDK version 23 (compileSdkVersion in <a href="https://github.com/facebook/react-native/blob/master/ReactAndroid/build.gradle"><code>build.gradle</code></a>)</li>
<li>SDK build tools version 23.0.1 (buildToolsVersion in <a href="https://github.com/facebook/react-native/blob/master/ReactAndroid/build.gradle"><code>build.gradle</code></a>)</li>
<li>Android Support Repository &gt;= 17 (for Android Support Library)</li>
<li>Android SDK version 27 (compileSdkVersion in <a href="https://github.com/facebook/react-native/blob/master/ReactAndroid/build.gradle"><code>build.gradle</code></a>)</li>
<li>SDK build tools version 26.0.2 (buildToolsVersion in <a href="https://github.com/facebook/react-native/blob/master/ReactAndroid/build.gradle"><code>build.gradle</code></a>)</li>
<li>Android Support Repository &gt;= 47 (for Android Support Library)</li>
<li>Android NDK (download links and installation instructions below)</li>
</ol>
<h3><a class="anchor" aria-hidden="true" name="point-gradle-to-your-android-sdk"></a><a href="#point-gradle-to-your-android-sdk" aria-hidden="true" class="hash-link" ><svg aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>Point Gradle to your Android SDK:</h3>
Expand Down
14 changes: 6 additions & 8 deletions docs/next/getting-started.html
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ <h4><a class="anchor" aria-hidden="true" name="1-install-android-studio"></a><a
</blockquote>
<p>Once setup has finalized and you're presented with the Welcome screen, proceed to the next step.</p>
<h4><a class="anchor" aria-hidden="true" name="2-install-the-android-sdk"></a><a href="#2-install-the-android-sdk" aria-hidden="true" class="hash-link" ><svg aria-hidden="true" height="16" version="1.1" viewBox="0 0 16 16" width="16"><path fill-rule="evenodd" d="M4 9h1v1H4c-1.5 0-3-1.69-3-3.5S2.55 3 4 3h4c1.45 0 3 1.69 3 3.5 0 1.41-.91 2.72-2 3.25V8.59c.58-.45 1-1.27 1-2.09C10 5.22 8.98 4 8 4H4c-.98 0-2 1.22-2 2.5S3 9 4 9zm9-3h-1v1h1c1 0 2 1.22 2 2.5S13.98 12 13 12H9c-.98 0-2-1.22-2-2.5 0-.83.42-1.64 1-2.09V6.25c-1.09.53-2 1.84-2 3.25C6 11.31 7.55 13 9 13h4c1.45 0 3-1.69 3-3.5S14.5 6 13 6z"></path></svg></a>2. Install the Android SDK</h4>
<p>Android Studio installs the latest Android SDK by default. Building a React Native app with native code, however, requires the <code>Android 6.0 (Marshmallow)</code> SDK in particular. Additional Android SDKs can be installed through the SDK Manager in Android Studio.</p>
<p>Android Studio installs the latest Android SDK by default. Additional Android SDKs can be installed through the SDK Manager in Android Studio.</p>
<p>The SDK Manager can be accessed from the &quot;Welcome to Android Studio&quot; screen. Click on &quot;Configure&quot;, then select &quot;SDK Manager&quot;.</p>
<p><block class="native mac android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedAndroidStudioWelcomeMacOS.png" alt="Android Studio Welcome"></p>
Expand All @@ -239,19 +239,17 @@ <h4><a class="anchor" aria-hidden="true" name="2-install-the-android-sdk"></a><a
<blockquote>
<p>The SDK Manager can also be found within the Android Studio &quot;Preferences&quot; dialog, under <strong>Appearance &amp; Behavior</strong><strong>System Settings</strong><strong>Android SDK</strong>.</p>
</blockquote>
<p>Select the &quot;SDK Platforms&quot; tab from within the SDK Manager, then check the box next to &quot;Show Package Details&quot; in the bottom right corner. Look for and expand the <code>Android 6.0 (Marshmallow)</code> entry, then make sure the following items are all checked:</p>
<p>Select the &quot;SDK Platforms&quot; tab from within the SDK Manager, then check the box next to &quot;Show Package Details&quot; in the bottom right corner. Look for and expand the <code>Android 8.0 (Oreo) and API 27</code> entry, then make sure the following items are all checked:</p>
<ul>
<li><code>Google APIs</code></li>
<li><code>Android SDK Platform 23</code></li>
<li><code>Intel x86 Atom_64 System Image</code></li>
<li><code>Google APIs Intel x86 Atom_64 System Image</code></li>
<li><code>Android SDK Platform 27</code></li>
<li><code>Google APIs Intel x86 Atom_64 System Image (or Google APIs Intel x86 Atom System Image)</code></li>
</ul>
<p><block class="native mac android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedAndroidSDKManagerMacOS.png" alt="Android SDK Manager"></p>
<p><block class="native windows android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedAndroidSDKManagerWindows.png" alt="Android SDK Manager"></p>
<p><block class="native windows mac linux android" /></p>
<p>Next, select the &quot;SDK Tools&quot; tab and check the box next to &quot;Show Package Details&quot; here as well. Look for and expand the &quot;Android SDK Build-Tools&quot; entry, then make sure that <code>23.0.1</code> is selected.</p>
<p>Optionally, select the &quot;SDK Tools&quot; tab and check the box next to &quot;Show Package Details&quot; here as well. Look for and expand the &quot;Android SDK Build-Tools&quot; entry, then make sure that <code>26.0.2</code> is selected.</p>
<p><block class="native mac android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedAndroidSDKManagerSDKToolsMacOS.png" alt="Android SDK Manager - 23.0.1 Build Tools"></p>
<p><block class="native windows android" /></p>
Expand Down Expand Up @@ -326,7 +324,7 @@ <h3><a class="anchor" aria-hidden="true" name="using-a-virtual-device"></a><a hr
<p><block class="native mac android" /></p>
<p><img src="/react-native/docs/assets/GettingStartedCreateAVDMacOS.png" alt="Android Studio AVD Manager"></p>
<p><block class="native mac windows linux android" /></p>
<p>Select the &quot;x86 Images&quot; tab, then look for the <strong>Marshmallow</strong> API Level 23, x86_64 ABI image with a Android 6.0 (Google APIs) target.</p>
<p>Select the &quot;x86 Images&quot; tab, then look for the <strong>Android API 27</strong>, x86 ABI, or the <strong>Oreo</strong> API Level 26, x86_64 ABI image with a Android 8.0 (Google APIs) target.</p>
<p><block class="native linux android" /></p>
<blockquote>
<p>We recommend configuring <a href="https://developer.android.com/studio/run/emulator-acceleration.html#vm-linux">VM acceleration</a> on your system to improve performance. Once you've followed those instructions, go back to the AVD Manager.</p>
Expand Down

0 comments on commit 7f468c9

Please sign in to comment.