Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to prevent devs from corrupting their NDK install." into mnc-mr-docs

Browse Source
This commit is contained in:
David Friedman
2016-04-22 18:19:50 +00:00
committed by Android (Google) Code Review
parent face65fe16 e7b05a72e2
commit 19d1e73e41
1 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
docs/html/ndk/guides/graphics/validation-layer.jd
View File

@@ -109,9 +109,36 @@ $ git checkout android_layers
</li> </li>
<li> <li>
Prepare to build by following the preparation instructions for your platform. These instructions Begin preparation for building by entering the following commands on the command line:
are in the {@code BUILD.md} file contained in the local instance of the repository you cloned. <ul>
<li>For Linux or OS X:
<ul>
<li>
<pre class="no-pretty-print">
$ cd build-android
$ ./android-generate</pre>
</li> </li>
</ul>
</li>
<li>For Windows:
<ul>
<li>
<pre class="no-pretty-print">
&gt; cd build-android
&gt; android-generate.bat</pre>
</li>
</ul>
</li>
</ul>
</li>
<li>
Continue by following the build instructions for your platform.
These instructions are in the {@code BUILD.md} file contained in the local instance of the
repository you cloned.
</li>
</ul>
</ol> </ol>
@@ -205,12 +232,10 @@ Android Studio.
<p> <p>
To build validation layers on Linux or OS X, enter these commands on the command line: To build validation layers on Linux or OS X, enter these commands on the command line:
</p> </p>
<ol> <ul>
<li> <li>
Using Gradle: Using Gradle:
<pre class="no-pretty-print"> <pre class="no-pretty-print">
$ cd build-android
$ ./android-generate
$ cd generated/gradle-build $ cd generated/gradle-build
$ # configure SDK and NDK path in local.properties $ # configure SDK and NDK path in local.properties
$ gradlew assembleAllDebug $ gradlew assembleAllDebug
@@ -219,22 +244,17 @@ $ gradlew assembleAllDebug
<li> <li>
Using Android makefiles: Using Android makefiles:
<pre class="no-pretty-print"> <pre class="no-pretty-print">
$ cd build-android $ ndk-build</pre>
$ ./android-generate
$ ndk-build
</pre>
</li> </li>
</ol> </ul>
<p> <p>
To build validation layers on Windows, enter these commands on the command line: To build validation layers on Windows, enter these commands on the command line:
</p> </p>
<ol> <ul>
<li> <li>
Using Gradle: Using Gradle:
<pre class="no-pretty-print"> <pre class="no-pretty-print">
&gt; cd build-android
&gt; android-generate.bat
&gt; cd generated\gradle-build &gt; cd generated\gradle-build
&gt; REM configure SDK and NDK path in local.properties &gt; REM configure SDK and NDK path in local.properties
&gt; gradlew.bat assembleAllDebug &gt; gradlew.bat assembleAllDebug
@@ -243,12 +263,10 @@ Using Gradle:
<li> <li>
Using Android makefiles: Using Android makefiles:
<pre class="no-pretty-print"> <pre class="no-pretty-print">
&gt; cd build-android
&gt; android-generate.bat
&gt; ndk-build.cmd &gt; ndk-build.cmd
</pre> </pre>
</li> </li>
</ol> </ul>