Fix docs about ABI x86_64

Fix places where ABI x86_64 were incorrectly described in x86-64

Change-Id: I2d067d1c3affeecfc3eda799eef2aec8525d35bb

6 files changed, 15 insertions, 15 deletions

diff --git a/docs/Programmers_Guide/html/index.html b/docs/Programmers_Guide/html/index.html
index 829502301..b56d80e95 100644
--- a/docs/Programmers_Guide/html/index.html
+++ b/docs/Programmers_Guide/html/index.html
@@ -113,7 +113,7 @@ $(document).ready(function(){initNavTree('index.html','');});
 <li>
 <a href="./md_3__key__topics__c_p_u__support__c_p_u-_x86.html">x86</a> </li>
 <li>
-<a href="md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html">x86-64</a> </li>
+<a href="md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html">x86_64</a> </li>
 <li>
 <a href="./md_3__key__topics__c_p_u__support__c_p_u-_f_e_a_t_u_r_e_s.html">CPU Features</a> </li>
 </ul>
diff --git a/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html b/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html
index 2dc68f5bf..30c1548fa 100644
--- a/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html
+++ b/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html
@@ -4,7 +4,7 @@
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.5"/>
-<title>NDK Programmer&#39;s Guide: x86-64</title>
+<title>NDK Programmer&#39;s Guide: x86_64</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -50,20 +50,20 @@ $(document).ready(function(){initNavTree('md_3__key__topics__c_p_u__support__c_p
 <div id="doc-content">
 <div class="header">
   <div class="headertitle">
-<div class="title">x86-64 </div>  </div>
+<div class="title">x86_64 </div>  </div>
 </div><!--header-->
 <div class="contents">
 <div class="textblock"><h2>Introduction</h2>
-<p>Android NDK r10 added support for the '<code>x86-64</code>' ABI, that allows native code to run on Android-based devices running on CPUs supporting the x86-64 instruction set.</p>
-<p>The Android x86-64 ABI itself is fully specified in docs/CPU-ARCH-ABIS.html.</p>
+<p>Android NDK r10 added support for the '<code>x86_64</code>' ABI, that allows native code to run on Android-based devices running on CPUs supporting the x86-64 instruction set.</p>
+<p>The Android x86_64 ABI itself is fully specified in docs/CPU-ARCH-ABIS.html.</p>
 <h2>Overview</h2>
-<p>Generating machine code is simple: just add 'x86-64' to your APP_ABI definition in your Application.mk file, for example: </p>
-<pre class="fragment">    APP_ABI := armeabi armeabi-v7a x86 x86-64
+<p>Generating machine code is simple: just add 'x86_64' to your APP_ABI definition in your Application.mk file, for example: </p>
+<pre class="fragment">    APP_ABI := armeabi armeabi-v7a x86 x86_64
 </pre><p>Alternatively, you can use: </p>
 <pre class="fragment">    APP_ABI := all
 </pre><p>will generate machine code for all supported ABIs with this NDK. Doing so will ensure that your application package contains libraries for all target ABIs. Note that this has an impact on package size, since each ABI will correspond to its own set of native libraries built from the same sources.</p>
 <p>The default ABI is still '<code>armeabi</code>', if unspecified in your project.</p>
-<p>As you would expect, generated libraries will go into <code>$PROJECT/libs/x86-64/</code>, and will be embedded into your .apk under <code>/lib/x86-64/</code>.</p>
+<p>As you would expect, generated libraries will go into <code>$PROJECT/libs/x86_64/</code>, and will be embedded into your .apk under <code>/lib/x86_64/</code>.</p>
 <p>And just like other ABIs, the Android package manager will extract these libraries on a <em>compatible</em> x86-64 based device automatically at install time, to put them under &lt;dataPath&gt;/lib, where &lt;dataPath&gt; is the application's private data directory.</p>
 <p>Similarly, the Google Play server is capable of filtering applications based on the native libraries they embed and your device's target CPU.</p>
 <p>Debugging with ndk-gdb should work exactly as described under docs/NDK-GDB.html.</p>
diff --git a/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__chapter_1-section_8__a_b_is.html b/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__chapter_1-section_8__a_b_is.html
index 1737a44f7..53ce0bfa2 100644
--- a/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__chapter_1-section_8__a_b_is.html
+++ b/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__chapter_1-section_8__a_b_is.html
@@ -108,7 +108,7 @@ MMX<br/>
 SSE/2/3<br>
 SSSE3</td><td>No support for MOVBE or SSE4.</td></tr>
 <tr>
-<td><a href="#86-64">x86-64</a> </td><td>x86-64<br/>
+<td><a href="#86-64">x86_64</a> </td><td>x86-64<br/>
 MMX<br/>
 SSE/2/3<br>
 SSSE3<br>
@@ -303,7 +303,7 @@ Programming Guide</a></li>
 Architecture Supplement</li>
 </ul>
 <p><a class="anchor" id="86-64"></a> </p>
-<h3>x86-64</h3>
+<h3>x86_64</h3>
 <p>This ABI is for CPUs supporting the instruction set commonly referred to as
 "x86-64." It supports instructions normally generated by GCC with the following
 compiler flags: </p>
@@ -425,7 +425,7 @@ copy the libraries over, and perform <code>dlopen()</code>.</p>
     lib/armeabi-v7a/libfoo.so
     lib/arm64-v8a/libfoo.so
     lib/x86/libfoo.so
-    lib/x86-64/libfoo.so
+    lib/x86_64/libfoo.so
     lib/mips/libfoo.so
     lib/mips64/libfoo.so
 </pre><p><b>NOTE::</b> ARMv7-based Android devices running 4.0.3 or earlier
diff --git a/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__instruction_sets_and__c_p_us.html b/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__instruction_sets_and__c_p_us.html
index a7907b8e0..53676baec 100644
--- a/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__instruction_sets_and__c_p_us.html
+++ b/docs/Programmers_Guide/html/md_3__key__topics__c_p_u__support__instruction_sets_and__c_p_us.html
@@ -71,8 +71,8 @@ $(document).ready(function(){initNavTree('md_3__key__topics__c_p_u__support__ins
 <li>Details about targeting devices with CPUs supporting the IA-32 instruction set.</li>
 </ul>
 </li>
-<li><a href="./md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html">x86-64</a><ul>
-<li>Details about targeting devices whose CPUs support the x86-64 instruction set.</li>
+<li><a href="./md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html">x86_64</a><ul>
+<li>Details about targeting devices whose CPUs support the x86_64 instruction set.</li>
 </ul>
 </li>
 <li><a href="./md_3__key__topics__c_p_u__support__c_p_u-_f_e_a_t_u_r_e_s.html">CPU Features</a><ul>
diff --git a/docs/Programmers_Guide/html/navtree.js b/docs/Programmers_Guide/html/navtree.js
index dd99a84d0..08696b4a0 100644
--- a/docs/Programmers_Guide/html/navtree.js
+++ b/docs/Programmers_Guide/html/navtree.js
@@ -23,7 +23,7 @@ var NAVTREE =
     [ "- Neon", "md_3__key__topics__c_p_u__support__c_p_u-_a_r_m-_n_e_o_n.html", null ],
     [ "- Mips", "md_3__key__topics__c_p_u__support__c_p_u-_m_i_p_s.html", null ],
     [ "- x86", "md_3__key__topics__c_p_u__support__c_p_u-_x86.html", null ],
-    [ "- x86-64", "md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html", null ],
+    [ "- x86_64", "md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html", null ],
     [ "- CPU Features", "md_3__key__topics__c_p_u__support__c_p_u-_f_e_a_t_u_r_e_s.html", null ],
     [ "Libraries", "md_3__key__topics__libraries_libraries.html", null ],
     [ "- Stable APIs", "md_3__key__topics__libraries__s_t_a_b_l_e-_a_p_i_s.html", null ],
diff --git a/docs/Programmers_Guide/html/pages.html b/docs/Programmers_Guide/html/pages.html
index 4b9da3b27..52685cc4b 100644
--- a/docs/Programmers_Guide/html/pages.html
+++ b/docs/Programmers_Guide/html/pages.html
@@ -69,7 +69,7 @@ $(document).ready(function(){initNavTree('pages.html','');});
 <tr id="row_11_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="md_3__key__topics__c_p_u__support__c_p_u-_a_r_m-_n_e_o_n.html" target="_self">Neon</a></td><td class="desc"></td></tr>
 <tr id="row_12_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="md_3__key__topics__c_p_u__support__c_p_u-_f_e_a_t_u_r_e_s.html" target="_self">CPU Features</a></td><td class="desc"></td></tr>
 <tr id="row_13_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="md_3__key__topics__c_p_u__support__c_p_u-_m_i_p_s.html" target="_self">Mips</a></td><td class="desc"></td></tr>
-<tr id="row_14_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html" target="_self">x86-64</a></td><td class="desc"></td></tr>
+<tr id="row_14_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="md_3__key__topics__c_p_u__support__c_p_u-_x86-64.html" target="_self">x86_64</a></td><td class="desc"></td></tr>
 <tr id="row_15_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="md_3__key__topics__c_p_u__support__c_p_u-_x86.html" target="_self">x86</a></td><td class="desc"></td></tr>
 <tr id="row_16_" class="even"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="md_3__key__topics__c_p_u__support__instruction_sets_and__c_p_us.html" target="_self">Architectures and CPUs</a></td><td class="desc"></td></tr>
 <tr id="row_17_"><td class="entry"><img src="ftv2node.png" alt="o" width="16" height="22" /><a class="el" href="md_3__key__topics__debugging_debugging.html" target="_self">Debugging</a></td><td class="desc"></td></tr>