Skip to content

Commit 022171b

Browse files
committed
Doc change: Add notes for SDK Tools r7 and ADT 0.9.8.
Change-Id: I7cc8301e0160acd0adb3efbd20c6515ed985684f
1 parent ca9d51b commit 022171b

File tree

11 files changed

+186
-44
lines changed

11 files changed

+186
-44
lines changed

Android.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,10 @@ framework_docs_SDK_CURRENT_DIR:=$(framework_docs_SDK_VERSION)_r$(framework_docs_
438438
framework_docs_SDK_PREVIEW:=0
439439

440440
## Latest ADT version identifiers, for reference from published docs
441-
framework_docs_ADT_VERSION:=0.9.7
442-
framework_docs_ADT_DOWNLOAD:=ADT-0.9.7.zip
443-
framework_docs_ADT_BYTES:=8033750
444-
framework_docs_ADT_CHECKSUM:=de2431c8d4786d127ae5bfc95b4605df
441+
framework_docs_ADT_VERSION:=0.9.8
442+
framework_docs_ADT_DOWNLOAD:=ADT-0.9.8.zip
443+
framework_docs_ADT_BYTES:=8703591
444+
framework_docs_ADT_CHECKSUM:=22070f8e52924605a3b3abf87c1ba39f
445445

446446
framework_docs_LOCAL_DROIDDOC_OPTIONS += \
447447
-hdf sdk.version $(framework_docs_SDK_VERSION) \

docs/html/guide/developing/eclipse-adt.jd

Lines changed: 70 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ page.title=Developing In Eclipse, with ADT
2121
<li><a href="#librarySetup">Setting up a library project</a></li>
2222
<li><a href="#libraryReference">Referencing a library project</a></li>
2323
<li><a href="#considerations">Development considerations</a></li>
24+
<li><a href="#libraryMigrating">Migrating library projects to ADT 0.9.8</a></li>
2425
</ol>
2526
</li>
2627
<li><a href="#Tips">Eclipse Tips</a></li>
@@ -644,10 +645,6 @@ across all projects). </p>
644645
is because the library project is compiled by the main project to use the
645646
correct resource IDs.</p>
646647

647-
<p><strong>One library project cannot reference another</strong></p>
648-
649-
<p>A library cannot depend on another library.</p>
650-
651648
<p><strong>A library project can include a JAR library</strong></p>
652649

653650
<p>You can develop a library project that itself includes a JAR library, however
@@ -664,13 +661,6 @@ application must declare the external library their manifest files, in a <a
664661
href="{@docRoot}guide/topics/manifest/uses-library-element.html"><code>&lt;uses-library&gt;</code></a>
665662
element. </p>
666663

667-
<p><strong>Library project can not include AIDL files</strong></p>
668-
669-
<p>The tools do not support the use of <a
670-
href="{@docRoot}guide/developing/tools/aidl.html">AIDL</a> files in a library project.
671-
Any AIDL files used by an application must be stored in the application project
672-
itself.</p>
673-
674664
<p><strong>Library project can not include raw assets</strong></p>
675665

676666
<p>The tools do not support the use of raw asset files in a library project.
@@ -730,8 +720,76 @@ project can reference the library project by a relative link. You can place the
730720
library project What is important is that the main project can reference the
731721
library project through a relative link.</p>
732722

723+
<h3 id="libraryMigrating">Migrating library projects to ADT 0.9.8</h3>
724+
725+
<p>This section provides information about how to migrate a library project
726+
created with ADT 0.9.7 to ADT 0.9.8 (or higher). The migration is needed only if
727+
you are developing in Eclipse with ADT and assumes that you have also upgraded
728+
to SDK Tools r7 (or higher). </p>
729+
730+
<p>The way that ADT handles library projects has changed between
731+
ADT 0.9.7 and ADT 0.9.8. Specifically, in ADT 0.9.7, the <code>src/</code>
732+
source folder of the library was linked into the dependent application project
733+
as a folder that had the same name as the library project. This worked because
734+
of two restrictions on the library projects:</p>
735+
736+
<ul>
737+
<li>The library was only able to contain a single source folder (excluding the
738+
special <code>gen/</code> source folder), and</li>
739+
<li>The source folder was required to have the name <code>src/</code> and be
740+
stored at the root of the project.</li>
741+
</ul>
742+
743+
<p>In ADT 0.9.8, both of those restrictions were removed. A library project can
744+
have as many source folders as needed and each can have any name. Additionally,
745+
a library project can store source folders in any location of the project. For
746+
example, you could store sources in a <code>src/java/</code> directory. In order
747+
to support this, the name of the linked source folders in the main project are
748+
now called &lt;<em>library-name</em>&gt;_&lt;<em>folder-name</em>&gt; For
749+
example: <code>MyLibrary_src/</code> or <code>MyLibrary_src_java/</code>.</p>
750+
751+
<p>Additionally, the linking process now flags those folders in order for ADT to
752+
recognize that it created them. This will allow ADT to automatically migrate the
753+
project to new versions of ADT, should they contain changes to the handling of
754+
library projects. ADT 0.9.7 did not flag the linked source folders, so ADT 0.9.8
755+
cannot be sure whether the old linked folders can be removed safely. After
756+
upgrading ADT to 0.9.8, you will need to remove the old linked folders manually
757+
in a simple two-step process, as described below.</p>
758+
759+
<p>Before you begin, make sure to create a backup copy of your application or
760+
save the latest version to your code version control system. This ensures that
761+
you will be able to easily revert the migration changes in case there is a
762+
problem in your environment.</p>
763+
764+
<p>When you first upgrade to ADT 0.9.8, your main project will look as shown
765+
below, with two linked folders (in this example, <code>MyLibrary</code> and
766+
<code>MyLibrary_src</code> &mdash; both of which link to
767+
<code>MyLibrary/src</code>. Eclipse shows an error on one of them because they
768+
are duplicate links to a single class.</p>
769+
770+
<img src="{@docRoot}images/developing/lib-migration-0.png" alt="">
771+
772+
<p>To fix the error, remove the linked folder that <em>does not</em> contain the
773+
<code>_src</code> suffix. </p>
774+
775+
<ol>
776+
<li>Right click the folder that you want to remove (in this case, the
777+
<code>MyLibrary</code> folder) and choose <strong>Build Path</strong> &gt;
778+
<strong>Remove from Build Path</strong>, as shown below.</li>
779+
780+
<img src="{@docRoot}images/developing/lib-migration-1.png" style="height:600px"
781+
alt="">
782+
783+
<li>Next, When asked about unlinking the folder from the project, select
784+
<strong>Yes</strong>, as shown below.</li>
785+
786+
<img src="{@docRoot}images/developing/lib-migration-2.png" alt="">
787+
</ol>
788+
789+
<p>This should resolve the error and migrate your library project to the new
790+
ADT environment. </p>
733791

734-
<h2 id="Tips">Eclipse Tips </h2>
792+
<h2 id="Tips">Eclipse Tips</h2>
735793

736794
<h3 id="arbitraryexpressions">Executing arbitrary Java expressions in Eclipse</h3>
737795

docs/html/guide/developing/other-ide.jd

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -838,10 +838,6 @@ across all projects). </p>
838838
is because the library project is compiled by the main project to use the
839839
correct resource IDs.</p>
840840

841-
<p><strong>One library project cannot reference another</strong></p>
842-
843-
<p>A library cannot depend on another library.</p>
844-
845841
<p><strong>A library project can include a JAR library</strong></p>
846842

847843
<p>You can develop a library project that itself includes a JAR library. When
@@ -858,13 +854,6 @@ application must declare the external library their manifest files, in a <a
858854
href="{@docRoot}guide/topics/manifest/uses-library-element.html"><code>&lt;uses-library&gt;</code></a>
859855
element. </p>
860856

861-
<p><strong>Library project cannot include AIDL files</strong></p>
862-
863-
<p>The tools do not support the use of <a
864-
href="{@docRoot}guide/developing/tools/aidl.html">AIDL</a> files in a library project.
865-
Any AIDL files used by an application must be stored in the application project
866-
itself.</p>
867-
868857
<p><strong>Library project cannot include raw assets</strong></p>
869858

870859
<p>The tools do not support the use of raw asset files in a library project.
26.2 KB
Loading
91.3 KB
Loading
18.2 KB
Loading

docs/html/sdk/adt_download.jd

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,18 @@ ADT Installation</a>.</p>
2222
<th>Notes</th>
2323
</tr>
2424
<tr>
25-
<td>0.9.7</td>
26-
<td><a href="http://dl-ssl.google.com/android/ADT-0.9.7.zip">ADT-0.9.7.zip</a></td>
25+
<td>0.9.8</td>
26+
<td><a href="http://dl-ssl.google.com/android/ADT-0.9.8.zip">ADT-0.9.8.zip</a></td>
2727
<td><nobr>{@adtZipBytes} bytes</nobr></td>
2828
<td>{@adtZipChecksum}</td>
29-
<td>Requires SDK Tools, Revision 6 <em><nobr>May 2010</nobr></em></td>
29+
<td>Requires SDK Tools, Revision 7 <em><nobr>September 2010</nobr></em></td>
30+
</tr>
31+
<tr>
32+
<td>0.9.7</td>
33+
<td><a href="http://dl-ssl.google.com/android/ADT-0.9.7.zip">ADT-0.9.7.zip</a></td>
34+
<td><nobr>8033750 bytes</nobr></td>
35+
<td>de2431c8d4786d127ae5bfc95b4605df</td>
36+
<td>Requires SDK Tools, Revision 5 <em><nobr>May 2010</nobr></em></td>
3037
</tr>
3138
<tr>
3239
<td>0.9.6</td>

docs/html/sdk/eclipse-adt.jd

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,61 @@ padding: .25em 1em;
9595
}
9696
</style>
9797

98+
99+
100+
98101
<div class="toggleable opened">
102+
<a href="#" onclick="return toggleDiv(this)">
103+
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" />
104+
ADT 0.9.8</a> <em>(August 2010)</em>
105+
<div class="toggleme">
106+
107+
108+
</ul>
109+
</dd>
110+
111+
<dl>
112+
113+
<dt>Dependencies:</dt>
114+
115+
<dd><p>ADT 0.9.8 is designed for use with SDK Tools r7 and later. Before
116+
updating to ADT 0.9.8, we highly recommend that you use the Android SDK and
117+
AVD Manager to install SDK Tools r7 into your SDK.</p></dd>
118+
119+
<dt>General notes:</dt>
120+
<dd>
121+
<ul>
122+
<li>Adds a new Action, "Rename Application Package", to the Android Tools
123+
contextual menu. The Action does a full application package refactoring.
124+
<li>Adds support for library projects that don't have a source folder
125+
called <code>src/</code>. There is now support for any number of source folders,
126+
with no name restriction. They can even be in subfolder such as
127+
<code>src/java</code>. If you are already working with library projects created
128+
in ADT 0.9.7, see <a
129+
href="{@docRoot}guide/developing/eclipse-adt.html#libraryMigrating">Migrating
130+
library projects to ADT 0.9.8</a> for important information about moving
131+
to the new ADT environment.</li>
132+
<li>Adds support for library projects that depend on other library
133+
projects.</li>
134+
<li>Adds support for additional resource qualifiers:
135+
<code>car</code>/<code>desk</code>, <code>night</code>/<code>notnight</code> and
136+
<code>navexposed</code>/<code>navhidden</code>.</li>
137+
<li>Adds more device screen types in the layout editor. All screen
138+
resolution/density combinations listed in the <a
139+
href="{@docRoot}guide/practices/screens_support.html#range">Supporting
140+
Multiple Screens</a> are now available.</li>
141+
<li>Fixes problems with handling of library project names that
142+
contain characters that are incompatible with the Eclipse path variable.
143+
Now properly sets up the link between the main project and the library
144+
project.</li>
145+
</ul>
146+
</dd>
147+
</dl>
148+
</div>
149+
</div>
150+
151+
152+
<div class="toggleable closed">
99153
<a href="#" onclick="return toggleDiv(this)">
100154
<img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />
101155
ADT 0.9.7</a> <em>(May 2010)</em>
@@ -120,6 +174,7 @@ project support through the Ant build system.</p>
120174
</div>
121175
</div>
122176

177+
123178
<div class="toggleable closed">
124179
<a href="#" onclick="return toggleDiv(this)">
125180
<img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />

docs/html/sdk/index.jd

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
page.title=Android SDK
22
sdk.redirect=0
33

4-
sdk.win_download=android-sdk_r06-windows.zip
5-
sdk.win_bytes=23293160
6-
sdk.win_checksum=7c7fcec3c6b5c7c3df6ae654b27effb5
4+
sdk.win_download=android-sdk_r07-windows.zip
5+
sdk.win_bytes=23669664
6+
sdk.win_checksum=69c40c2d2e408b623156934f9ae574f0
77

8-
sdk.mac_download=android-sdk_r06-mac_86.zip
9-
sdk.mac_bytes=19108077
10-
sdk.mac_checksum=c92abf66a82c7a3f2b8493ebe025dd22
8+
sdk.mac_download=android-sdk_r07-mac_x86.zip
9+
sdk.mac_bytes=19229546
10+
sdk.mac_checksum=0f330ed3ebb36786faf6dc72b8acf819
1111

12-
sdk.linux_download=android-sdk_r06-linux_86.tgz
13-
sdk.linux_bytes=16971139
14-
sdk.linux_checksum=848371e4bf068dbb582b709f4e56d903
12+
sdk.linux_download=android-sdk_r07-linux_x86.tgz
13+
sdk.linux_bytes=17114517
14+
sdk.linux_checksum=e10c75da3d1aa147ddd4a5c58bfc3646
1515

1616
@jd:body
1717

@@ -50,7 +50,7 @@ for Eclipse</a>.</p>
5050
<p><strong>4. Add Android platforms and other components to your SDK</strong></p>
5151

5252
<p>Use the Android SDK and AVD Manager, included in the SDK starter package, to
53-
add one or more Android platforms (for example, Android 1.6 or Android 2.0) and
53+
add one or more Android platforms (for example, Android 1.6 or Android 2.2) and
5454
other components to your SDK. If you aren't sure what to add, see <a
5555
href="installing.html#which">Which components do I need?</a></p>
5656

docs/html/sdk/sdk_toc.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
</li>
7676
</ul>
7777
<ul>
78-
<li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r6</a>
79-
</li>
78+
<li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r7</a>
79+
<span class="new">new!</span></li>
8080
<li><a href="<?cs var:toroot ?>sdk/win-usb.html">USB Driver for
8181
Windows, r3</a>
8282
</li>
@@ -94,15 +94,15 @@
9494
<span style="display:none" class="zh-TW"></span>
9595
</h2>
9696
<ul>
97-
<li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 0.9.7
97+
<li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 0.9.8
9898
<span style="display:none" class="de"></span>
9999
<span style="display:none" class="es"></span>
100100
<span style="display:none" class="fr"></span>
101101
<span style="display:none" class="it"></span>
102102
<span style="display:none" class="ja"></span>
103103
<span style="display:none" class="zh-CN"></span>
104104
<span style="display:none" class="zh-TW"></span></a>
105-
</li>
105+
<span class="new">new!</span></li>
106106
</ul>
107107
</li>
108108
<li>

0 commit comments

Comments
 (0)