Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19d1e73e authored by David Friedman's avatar David Friedman Committed by Android (Google) Code Review
Browse files

Merge "Docs: Minor fix and restructuring to Vulkan validation-layer doc to... 

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

docs/html/ndk/guides/graphics/validation-layer.jd

+34 −16
Original line number Diff line number Diff line
@@ -109,10 +109,37 @@ $ git checkout android_layers 
</li>



<li>

Prepare to build by following the preparation instructions for your platform. These instructions

are in the {@code BUILD.md} file contained in the local instance of the repository you cloned.

Begin preparation for building by entering the following commands on the command line:

<ul>

   <li>For Linux or OS X:

   <ul>

      <li>

      <pre class="no-pretty-print">

$ cd build-android

$ ./android-generate</pre>

      </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>



<h3 id="ias">Android Studio Integration</h3>
@@ -205,12 +232,10 @@ Android Studio. 
<p>

To build validation layers on Linux or OS X, enter these commands on the command line:

</p>

<ol>

<ul>

<li>

Using Gradle:

<pre class="no-pretty-print">

$ cd build-android

$ ./android-generate

$ cd generated/gradle-build

$ # configure SDK and NDK path in local.properties

$ gradlew assembleAllDebug
@@ -219,22 +244,17 @@ $ gradlew assembleAllDebug 
<li>

Using Android makefiles:

<pre class="no-pretty-print">

$ cd build-android

$ ./android-generate

$ ndk-build

</pre>

$ ndk-build</pre>

</li>

</ol>

</ul>



<p>

To build validation layers on Windows, enter these commands on the command line:

</p>

<ol>

<ul>

<li>

Using Gradle:

<pre class="no-pretty-print">

&gt; cd build-android

&gt; android-generate.bat

&gt; cd generated\gradle-build

&gt; REM configure SDK and NDK path in local.properties

&gt; gradlew.bat assembleAllDebug
@@ -243,12 +263,10 @@ Using Gradle: 
<li>

Using Android makefiles:

<pre class="no-pretty-print">

&gt; cd build-android

&gt; android-generate.bat

&gt; ndk-build.cmd

</pre>

</li>

</ol>

</ul>