Docs: Move Downloads to CTS, remove CDD links
Bug: 28278634
Change-Id: Ic06ec376fd05dd403f645221126eb76703ecf0bd
diff --git a/src/compatibility/compatibility_toc.cs b/src/compatibility/compatibility_toc.cs
index 508b53a..1b8a503 100644
--- a/src/compatibility/compatibility_toc.cs
+++ b/src/compatibility/compatibility_toc.cs
@@ -57,9 +57,9 @@
</li>
<li><a href="<?cs var:toroot ?>compatibility/cts/interpret.html">Interpret Results</a></li>
<li><a href="<?cs var:toroot ?>compatibility/cts/development.html">Develop CTS</a></li>
+ <li><a href="<?cs var:toroot ?>compatibility/cts/downloads.html">Downloads</a></li>
</ul>
</li>
- <li><a href="<?cs var:toroot ?>compatibility/downloads.html">Downloads</a></li>
<li><a href="<?cs var:toroot ?>compatibility/contact-us.html">Contact Us</a></li>
</ul>
<!-- End Compatibility -->
diff --git a/src/compatibility/downloads.jd b/src/compatibility/cts/downloads.jd
similarity index 86%
rename from src/compatibility/downloads.jd
rename to src/compatibility/cts/downloads.jd
index a52bafa..5dbab5b 100644
--- a/src/compatibility/downloads.jd
+++ b/src/compatibility/cts/downloads.jd
@@ -2,7 +2,7 @@
@jd:body
<!--
- Copyright 2015 The Android Open Source Project
+ Copyright 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -32,8 +32,6 @@
The source code for the following tests can be synced with the
'android-cts-6.0_r5' tag in the open-source tree.</p>
<ul>
-<li><a href="6.0/android-6.0-cdd.pdf">Android 6.0 Compatibility Definition
-Document (CDD)</a></li>
<li><a
href="https://dl.google.com/dl/android/cts/android-cts-6.0_r5-linux_x86-arm.zip">Android
6.0 R5 Compatibility Test Suite (CTS) - ARM</a></li>
@@ -53,8 +51,6 @@
The source code for the following tests can be synced with the
'android-cts-5.1_r6' tag in the open source tree.</p>
<ul>
-<li><a href="5.1/android-5.1-cdd.pdf">Android 5.1 Compatibility Definition
-Document (CDD)</a></li>
<li><a
href="https://dl.google.com/dl/android/cts/android-cts-5.1_r6-linux_x86-arm.zip">Android
5.1 R6 Compatibility Test Suite (CTS) - ARM</a></li>
@@ -74,8 +70,6 @@
The source code for the following tests can be synced with the
'android-cts-5.0_r5' tag in the open source tree.</p>
<ul>
-<li><a href="5.0/android-5.0-cdd.pdf">Android 5.0 Compatibility Definition
-Document (CDD)</a></li>
<li><a
href="https://dl.google.com/dl/android/cts/android-cts-5.0_r5-linux_x86-arm.zip">Android
5.0 R5 Compatibility Test Suite (CTS) - ARM</a></li>
@@ -95,8 +89,6 @@
KitKat. Source code for Android 4.4 is found in the
'android-cts-4.4_r4' branch in the open source tree.</p>
<ul>
-<li><a href="4.4/android-4.4-cdd.pdf">Android 4.4 Compatibility Definition
-Document (CDD)</a></li>
<li><a
href="https://dl.google.com/dl/android/cts/android-cts-4.4_r4-linux_x86-arm.zip">Android
4.4 R4 Compatibility Test Suite (CTS) - ARM</a></li>
@@ -115,7 +107,6 @@
<p>Android 4.3 is the release of the development milestone code-named
Jelly Bean-MR2. Source code for Android 4.3 is found in the 'android-4.3_r2.2-cts' branch in the open source tree.</p>
<ul>
-<li><a href="4.3/android-4.3-cdd.pdf">Android 4.3 Compatibility Definition Document (CDD)</a></li>
<li><a
href="https://dl.google.com/dl/android/cts/android-cts-4.3_r2-linux_x86-arm.zip">Android
4.3 R2 Compatibility Test Suite (CTS)</a></li>
@@ -128,7 +119,6 @@
<p>Android 4.2 is the release of the development milestone code-named
Jelly Bean-MR1. Source code for Android 4.2 is found in the 'android-4.2.2_r1' branch in the open source tree.</p>
<ul>
-<li><a href="4.2/android-4.2-cdd.pdf">Android 4.2 Compatibility Definition Document (CDD)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-4.2_r4-linux_x86-arm.zip">Android 4.2 R4 Compatibility Test Suite (CTS)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-verifier-4.2_r5-linux_x86-arm.zip">Android 4.2 R5 CTS Verifier</a></li>
</ul>
@@ -137,7 +127,6 @@
Bean. The source code of the Compatibility Test Suite revisions below is
available at the 'android-cts-4.1_r4' tag in the open source tree.</p>
<ul>
-<li><a href="4.1/android-4.1-cdd.pdf">Android 4.1 Compatibility Definition Document (CDD)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-4.1_r4-linux_x86-arm.zip">Android 4.1 R4 Compatibility Test Suite (CTS)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-verifier-4.1_r7-linux_x86-arm.zip">Android 4.1 R7 CTS Verifier</a></li>
</ul>
@@ -146,7 +135,6 @@
Ice Cream Sandwich. Source code for
Android 4.0.3 is found in the 'android-4.0.3_r1' branch in the open source tree.</p>
<ul>
-<li><a href="4.0/android-4.0-cdd.pdf">Android 4.0 Compatibility Definition Document (CDD)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-4.0.3_r3-linux_x86-arm.zip">Android 4.0.3 R3 Compatibility Test Suite (CTS)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-verifier-4.0.3_r2-linux_x86-arm.zip">Android 4.0.3 R2 CTS Verifier</a></li>
</ul>
@@ -155,7 +143,6 @@
Gingerbread. Source code for Android 2.3 is found in the 'gingerbread' branch in
the open source tree.</p>
<ul>
-<li><a href="2.3/android-2.3.3-cdd.pdf">Android 2.3 Compatibility Definition Document (CDD)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-2.3_r13-linux_x86-arm.zip">Android 2.3 R13 Compatibility Test Suite (CTS)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-verifier-2.3_r3-linux_x86-armv5.zip">Android 2.3 R3 CTS Verifier</a></li>
</ul>
@@ -164,7 +151,6 @@
FroYo. Source code for Android 2.2 is found in the 'froyo' branch in the
open source tree.</p>
<ul>
-<li><a href="2.2/android-2.2-cdd.pdf">Android 2.2 Compatibility Definition Document (CDD)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-2.2_r8-linux_x86-arm.zip">Android 2.2 R8 Compatibility Test Suite (CTS)</a></li>
</ul>
<h2 id="android-21">Android 2.1</h2>
@@ -173,7 +159,6 @@
open source tree. Note that for technical reasons, there is no compatibility
program for Android 2.0 or 2.0.1, and new devices must use Android 2.1.</p>
<ul>
-<li><a href="2.1/android-2.1-cdd.pdf">Android 2.1 Compatibility Definition Document (CDD)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-2.1_r5-x86.zip">Android 2.1 R5 Compatibility Test Suite (CTS)</a></li>
</ul>
<h2 id="android-16">Android 1.6</h2>
@@ -181,12 +166,11 @@
Android 1.6 was obsoleted by Android 2.1. Source code for Android 1.6 is found
in the 'donut' branch in the open source tree.</p>
<ul>
-<li><a href="1.6/android-1.6-cdd.pdf">Android 1.6 Compatibility Definition Document (CDD)</a></li>
<li><a href="https://dl.google.com/dl/android/cts/android-cts-1.6_r1-x86.zip">Android 1.6 R1 Compatibility Test Suite (CTS)</a></li>
</ul>
<h2 id="compatibility-test-suite-manual">Compatibility Test Suite Manual</h2>
<ul>
-<li><a href="cts/index.html">Compatibility Test Suite (CTS) User Manual</a></li>
+<li><a href="index.html">Compatibility Test Suite (CTS) User Manual</a></li>
</ul>
<h2 id="cts-media-files">CTS Media Files</h2>
<p>These media files are required for the CTS media stress tests.</p>
diff --git a/src/compatibility/cts/index.jd b/src/compatibility/cts/index.jd
index 34ee5b0..165e8d2 100644
--- a/src/compatibility/cts/index.jd
+++ b/src/compatibility/cts/index.jd
@@ -27,7 +27,7 @@
<h2 id="how-does-the-cts-work">How does the CTS work?</h2>
<p>The Compatibility Test Suite (CTS) is a free, commercial-grade test suite,
-available for <a href="../downloads.html">download</a>. The CTS represents the
+available for <a href="downloads.html">download</a>. The CTS represents the
"mechanism" of compatibility.</p>
<p>The CTS runs on a desktop machine and executes test cases directly on
@@ -51,7 +51,7 @@
</ul>
<p>The Compatibility Test Suite Verifier (CTS Verifier) is a supplement to the
-CTS available for <a href="../downloads.html">download</a>. CTS Verifier
+CTS available for <a href="downloads.html">download</a>. CTS Verifier
provides tests for APIs and functions that cannot be tested on a stationary
device without manual input (e.g. audio quality, accelerometer, etc).</p>
diff --git a/src/compatibility/cts/interpret.jd b/src/compatibility/cts/interpret.jd
index 0014044..19df62e 100644
--- a/src/compatibility/cts/interpret.jd
+++ b/src/compatibility/cts/interpret.jd
@@ -25,7 +25,7 @@
<p>If you have built the CTS yourself, <em>$CTS_ROOT</em> will resemble the
path <em>out/host/linux-x86/cts</em> but differ by platform. This reflects the
path where you have uncompressed the prebuilt official CTS <a
-href="{@docRoot}compatibility/downloads.html">downloaded</a> from this site.</p>
+href="downloads.html">downloaded</a> from this site.</p>
<p>Inside the zip, the testResult.xml file contains the actual results—open
this file in any web browser (HTML5 compatible browser recommended) to view the
diff --git a/src/compatibility/cts/setup.jd b/src/compatibility/cts/setup.jd
index c486b94..fb4d096 100644
--- a/src/compatibility/cts/setup.jd
+++ b/src/compatibility/cts/setup.jd
@@ -82,12 +82,12 @@
<h3 id=CTS_files>CTS files</h3>
-<p><a href="{@docRoot}compatibility/downloads.html">Download</a> and open the CTS
+<p><a href="downloads.html">Download</a> and open the CTS
packages matching your devices' Android version and all the Application Binary
Interfaces (ABIs) your devices support.</p>
<p>Download and open the latest version of the <a
-href="{@docRoot}compatibility/downloads.html#cts-media-files">CTS Media
+href="downloads.html#cts-media-files">CTS Media
Files</a>.</p>
<h3 id=system_detect>Device detection</h3>
diff --git a/src/compatibility/cts/verifier.jd b/src/compatibility/cts/verifier.jd
index 128342d..9a4daed 100644
--- a/src/compatibility/cts/verifier.jd
+++ b/src/compatibility/cts/verifier.jd
@@ -42,7 +42,7 @@
<ul>
<li>Install the <a href="http://developer.android.com/sdk/index.html">Android
SDK</a> on the Linux computer <li>Download the appropriate <a
-href="{@docRoot}compatibility/downloads.html">CTS Verifier.apk</a> for the
+href="downloads.html">CTS Verifier.apk</a> for the
version of Android under test.
<li>Install CTS Verifier.apk to the <em>Device Under Test</em> (DUT). <br>
<code>adb install -r -g CtsVerifier.apk</code>
diff --git a/src/compatibility/overview.jd b/src/compatibility/overview.jd
index ef4c988..6519f20 100644
--- a/src/compatibility/overview.jd
+++ b/src/compatibility/overview.jd
@@ -70,7 +70,7 @@
<p><em>Minimize costs and overhead associated with compatibility.</em>
Ensuring compatibility should be easy and inexpensive to
device manufacturers. The testing tool is free, open source, and
-available for <a href="downloads.html">download</a>.
+available for <a href="cts/downloads.html">download</a>.
It is designed to be used for continuous self-testing
during the device development process to eliminate the cost of changing your
workflow or sending your device to a third party for testing. Meanwhile, there
diff --git a/src/devices/graphics/cts-integration.jd b/src/devices/graphics/cts-integration.jd
index c8be6b6..7b04c57 100644
--- a/src/devices/graphics/cts-integration.jd
+++ b/src/devices/graphics/cts-integration.jd
@@ -32,7 +32,7 @@
<p>Android CTS requires a certain subset of tests, called the <code>mustpass</code> list, to pass. The <code>mustpass</code> list includes OpenGL ES 3.0, OpenGL ES 3.1, and the Android Extension Pack tests. If a device doesn't support a target API or extension, tests are skipped and reported as passing.
The <code>mustpass</code> files can be found under the <code>android/cts</code> directory in the deqp source tree.</p>
-<p>Deqp tests are included in the Android CTS release packages, available on the <a href="{@docRoot}compatibility/downloads.html">Android Compatibility Downloads</a> page. </p>
+<p>Deqp tests are included in the Android CTS release packages, available on the <a href="{@docRoot}compatibility/cts/downloads.html">Android Compatibility Downloads</a> page. </p>
<p>You can run deqp tests through the <code>cts-tradefed</code> utility with the following command:</p>
