History log of /sdk/files/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
225fe918975d7a87daebd5f37afa60a46075699d 21-Sep-2012 Xavier Ducrohet <xav@android.com> Merge "Pre-dexed libraries."
98b631c6b3765be96b3707ba7aa54d52b10f4872 12-Jun-2012 Xavier Ducrohet <xav@android.com> Pre-dexed libraries.

Change-Id: I5aabcf3d7acaa9573c991860db3fcc8ea34bc866
nt/build.xml
bbfb29424d981151074107221fa728a5ffc47123 21-Sep-2012 Xavier Ducrohet <xav@android.com> Fix new R class generation for libraries

- only generate the R class of libraries when the project is not a lib
- package the manifest classes of libraries since we only do
delayed generation of the R class now.

Change-Id: I54908984651dab73b3496145120e2ee7cf9c6c9a
nt/build.xml
aea408b68a6f833327b6e0954a28f414f58133ac 14-Sep-2012 Xavier Ducrohet <xav@android.com> Generate smaller R classes for libraries.

Using the new --output-text-symbols from aapt the build
system now generates the R class for libraries manually
based on the symbols exported by the libraries and the
final values computed by aapt when using all the resource
folders.

Because only R.java is concerned, the Manifest class is
now included in the library jar file.

Also added a new test apps that uses instrumentation to
verify the build system.

Change-Id: Ic436ea8eb070844e9db8b3b2620fbf665839d40b
nt/build.xml
813bf88a44dab30cdeb5a4462bd174355bc48f55 15-Aug-2012 Xavier Ducrohet <xav@android.com> Add Ant support for UI automation test.

Also fix a bug in a custom ant task where minSdkVersion and targetApi
were swapped.

Change-Id: Id9bac802377a04270e76def42eaf6a8fb4b3f874
nt/uibuild.xml
02782ed0bfeff25831ddf753f9b99c72d6913bd8 10-Aug-2012 Michael Wright <michaelwr@google.com> Update devices.xml shipped with tools

Rather than containing the generic devices which are now packaged with
ADT itself, it contains the nexus devices using the new device
specification.

Change-Id: I09b38b8166ba558800c2cf03150d8a3e9dd33a4f
evices.xml
057e5374a3c774555b8c0d8457997b4c368cf732 06-Aug-2012 Tor Norbye <tnorbye@google.com> Merge "Allow lint cli --sources to specify a path, and use from ant lint"
ee4780f1de04e7c87b3fe172a4b1510bd4c7e9bf 06-Aug-2012 Tor Norbye <tnorbye@google.com> Allow lint cli --sources to specify a path, and use from ant lint

First, this changeset allows the arguments passed to --sources and
--classpath (renamed from --classes) to specify not just a directory,
but to specify a path as well. This might make it easier to invoke
lint from scripts if you have a path variable, so you don't have to
split it into multiple arguments.

Second, it makes the lint task in ant use these, such that any
build.xml customizations to the source paths or class paths are
automatically used rather than relying on lint's default structure
check.

Change-Id: Id8e4caf0010d7fd7245844b3099b5dc0607f0aba
nt/build.xml
2fb2655ff72c6cf7f6cb0ac7e933304a5a1298e0 02-Aug-2012 Tor Norbye <tnorbye@google.com> Add support for additional languages in the typo detector

This checkin adds typo databases for six additional languages, as well
as several fixes to the infrastructure.

First, it now supports "globbing", since for example the German typo
database contains glob patterns of the form
"asymetrisch*->asymmetrisch*".

Second, it supports multiword typos (such as "all zu->allzu") which
caused some complications (since this means that the typo detector
can match beyond the word boundary it was passed in).

Third, it adds a bunch of validation code to the type dictionaries,
which uncovered a bunch of inconsistencies (duplicate entries, using
"-" instead of "->" for some separators, etc). There's now a unit test
which produces a cleaned up version of each dictionary file, as well
as tests to ensure that the ASCII and the UTF-8 comparison methods are
in sync (and this uncovered some bugs which were fixed.)

Finally, it fixes the HTML reporter such that it properly handles
UTF-8.

Change-Id: Ie32cbbe489687a7b50184696a027f87c2e21c409
ypos-en.txt
ypos-nb.txt
ypos/typos-de.txt
ypos/typos-en.txt
ypos/typos-es.txt
ypos/typos-hu.txt
ypos/typos-it.txt
ypos/typos-nb.txt
ypos/typos-pt.txt
ypos/typos-tr.txt
7a4430395129714d192cc1bb21cc0fd2119b6ec8 25-Jul-2012 Tor Norbye <tnorbye@google.com> Multilingual typo checker

This changeset generalizes the lint typo checker to handle
non-ASCII languages (with UTF-8 encoded typo dictionaries).

Change-Id: If21a2047a127848db77d9ec6f9aae3c052e0f288
ypos-nb.txt
25fa37b4c9e6908bd1bdebcf255cc4e9e2c00d57 30-Jul-2012 Tor Norbye <tnorbye@google.com> ADT 20.0.0 => 21.0.0 dev

Change-Id: Idde24b6b893d1029d48ba32766110a6a3cdf73c6
ools_source.properties
8b4e35ff789782542c41e921472c3ac57891dad2 25-Jul-2012 Xavier Ducrohet <xav@android.com> Add 7" @tvdpi tablet to devices.xml

Change-Id: I4b6f33a919e4879b57fae62651f101ced82e02d0
evices.xml
a55067435f57c7a25f416ecde509d790a5e0799e 21-Jul-2012 Tor Norbye <tnorbye@google.com> Add lint target for ant

Running "ant lint" will now run lint on the project, and dump out the
errors to the console as well as also export the errors to lint.xml
and lint.html int the bin/ directory.

This changeset also modifies the lint CLI to allow multiple
simultaneous result reporters - so you don't have to run lint twice in
order to get both an .xml and an .html report for example (which is
useful when you're running lint on a continuous integration server,
and you want the .xml file for the lint plugin trend graph and the
html file as a user readable report to click through to from the build
page.)

Change-Id: Idf8f3f5de0857eb9e7180267a066ae933640682d
nt/build.xml
662db9123554e1b067d95e4590f2cf543b4e4f8f 11-Jul-2012 Xavier Ducrohet <xav@android.com> Fix renderscript compilation from Ant.

Change-Id: Ie9fa05173a5e4e1c7cae48cabb37f3cfe7d085cb
nt/build.xml
1c6e494f48261efe74278568c4aa81394502d802 03-Jul-2012 Xavier Ducrohet <xav@android.com> Fix detecting previous build states.

The checks were done before reading the properties.

Bug: http://code.google.com/p/android/issues/detail?id=34127
Change-Id: I954d1e2c585ec57ed3c1f5fc371b0af7dfa3c369
nt/build.xml
5e290ab6060c3204be3a3eb6084db6f92c88adee 19-Jun-2012 Tor Norbye <tnorbye@google.com> Add typo detector

This changeset adds a new typo detector. There
are also some lint infrastructure fixes to better
handle positions within text nodes, and to allow
Eclipse lint quickfixes to supply multiple fixes
for a single issue (such as multiple misspelling
alternative replacements.)

Change-Id: Ie26f0bafc571e02ae09ff27a7f4b221fe0c2ea5b
ypos-en.txt
6dbfb38476e17c888520e2d9dc22ce7bd4665cde 18-Jun-2012 Xavier Ducrohet <xav@android.com> Update SDK release files.

(cherry picked from commit 93ebf9bf54c3e052a49f68a221b57577e5f602ef)

Change-Id: I3d70a48286674d43a7af6212dabce7053e2e1c7c
lugin.prop
ools_source.properties
a12a01f80d45941967b99a537a11fd4b98eed23c 16-Jun-2012 Xavier Ducrohet <xav@android.com> Add lib source folders to the emma report.

This allows seeing the library source code in the HTML
report.

Change-Id: I30cd9fa99d2962bb4c12cba6f2ba044857836b93
nt/build.xml
aaeb6a3d58ce5dccc91360bb429b5e37af650619 16-Jun-2012 Xavier Ducrohet <xav@android.com> Fix issue where libraries were not getting instrumented.

They actually were instrumented but the emma output file was not
passed to the report task.

After trying to make each library generate its own .em file and
passing to the report task, I gave up due to FileSet (and the
report task) being stupid.

So the main fix is having the libraries contribute to the main coverage.em
file (since it's build using the merge option) which location is passed
to the library project.

The changes to the custom task was to support querying the libraries for
a path with a given leaf (from the lib root folder) but this is not
used at the moment. The other tasks are slightly cleaned up due to
this though and are getting prepared to support customized folder
names in folder.

Change-Id: Ife59a2971ce6f2acf01b923abe90dea8adee462a
nt/build.xml
fcb82e3185d657e3b5440295478cdc58afd168c3 15-Jun-2012 Xavier Ducrohet <xav@android.com> Fix emma for split projects.

The location of the .em file was wrong. Changing its location
means it gets put in the tested project so we need a way to know where
the output of the project is.

As we need to be better at supporting customized projects folder, we
introduce a new task that will be able to look for the customized
path of any projects. So far we only support the output folder
and the source folder.

Change-Id: Id8db82e254baae2088827c96b7719f94c92c927c
nt/build.xml
e86ac701205c6fdb0d2ae91e025024aec4f6a9de 08-May-2012 Tor Norbye <tnorbye@google.com> Include a default proguard config file with optimization

Adds a new proguard-android-optimize.txt file alongside the
default proguard-android.txt file in tools/proguard/ which
project.properties files can point to. The shrinking rules
are the same, but unlike proguard-android.txt, the new config
file leave optimization enabled. This allows users to point
to a tool-managed proguard file rather than forking the
default file in order to edit out the -dontoptimize flag.

Change-Id: I2f0fc8361e3964843a4cafe4f4087a6dee68b5ce
roguard-android-optimize.txt
roguard-android.txt
059a2b80b4385b5f3784ccec0b6a6533d5862ac6 02-Jun-2012 Xavier Ducrohet <xav@android.com> Fix to improved aidl support

This is from review comments. I meant to upload
this before commit but forgot.

Change-Id: Ia2eef22f2a5e6a5120110e69b49491a803636768
nt/build.xml
665f681e4881a7472f8ebcb7c4fb9a6771aada29 02-Jun-2012 Xavier Ducrohet <xav@android.com> Projects can now access aidl files from their libraries.

Library projects now copy their aidl files into bin/aidl.

Aidl is now called with this import path for all referenced
library projects.

Also added a test project.

Change-Id: I7f94489e87450be67a16ed7198f85b8b472f5025
nt/build.xml
249dc0127b12679441013dd78208706feb632c59 26-May-2012 Xavier Ducrohet <xav@android.com> Use aapt output to feed proguard's keep list.

This allows us to only keep classes that are really used either
through code or through XML. Also tweak the default rules for
better control of animated properties.

Added a test of a custom property animation and fixed some other
misc test files.

Change-Id: I7cc5839a764881d8d3c7bfce0a3f12ea7cba660e
nt/build.xml
roguard-android.txt
6a98de15b34aad728c6a28fa8da0d9fe4e9fe4f5 11-May-2012 Raphael Moll <ralf@android.com> SDK/ant: pass --ignore-assets flag to AAPT.

Requires change Ia4caa2a8 from frameworks/base.git

Change-Id: Ifcb469a64146ac2ae65f8516ee9dcfb857a7e2aa
nt/build.xml
57dc74c376c4456eb669523b68e3af4309209a86 24-Apr-2012 Xavier Ducrohet <xav@android.com> Merge changes I4f89b469,I33b49c9f,I425e7b75

* changes:
Revert the disable flag of the manifest merger to be enable instead.
Minor fixes in Ant.
Manifest merger in Ant build.
e6ec57d99bfda23f18ec7ec27022c5321b7368e5 24-Apr-2012 Xavier Ducrohet <xav@android.com> Revert the disable flag of the manifest merger to be enable instead.

Change-Id: I4f89b469e06f741b95b92d7a4826f979c64dab1b
nt/build.xml
748baf7722e5de113979f76eeeece70481ef503e 24-Apr-2012 Xavier Ducrohet <xav@android.com> Update location of emma's temp files.

This ensure they are always put in the bin folder
even if the script is run from another folder than
the project one.

Change-Id: Iafda3217f4ddc03f11e8821f089bf855caa99e7d
nt/build.xml
3b7b3c0cc33462c7eebae6fbd7f5e994625b9011 23-Apr-2012 Xavier Ducrohet <xav@android.com> Minor fixes in Ant.

Moved the definition of the custom Ant tasks
into a properties file put in the jar files.

Change-Id: I33b49c9f8f51ffa4f8a8dcaefccc6e0d874a6a9d
nt/build.xml
dedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5 19-Apr-2012 Xavier Ducrohet <xav@android.com> Manifest merger in Ant build.

This merges the manifest of the libraries into the application's
manifest.

Change-Id: I425e7b75f71d3f50c6422cdb62bb5ec6811ce99d
nt/build.xml
47f429464374712e770b8e9b703790faa75dff19 13-Apr-2012 Xavier Ducrohet <xav@android.com> Properly exclude some classes in code coverage.

Using a custom task to create the filter based on the
app packages for the main project and its library projects and
the list of class to exclude.

Change-Id: Id37862bf53656bd17991b5c307d772ed2019650b
nt/build.xml
1daa8f999d87443d14f698ca8ccc103e3309fa3e 30-Mar-2012 Xavier Ducrohet <xav@android.com> Fix "ant test" + misc clean up / reorganization of build.xml

- Split NewSetupTask in several tasks to make things more flexible.
Particularly this allows more targets to get access to the project
type (app, lib, test, ...) as it's not so computive intensive.

- Fix test project to give them access to the full tested project's
classpath.

- Fix support for projects that test themselves.

- Make sure library projects are instrumented when using the
emma target.

Change-Id: Ia0c9564eacee2521e7cbd5154b8a85ea287ad4fd
nt/build.xml
nt/pre_setup.xml
efee7484327b4a658410a78d8ff44a1f6c9a5c13 13-Apr-2012 Xavier Ducrohet <xav@android.com> Move tools to r20

Change-Id: I3877a7418da193cbe3759f25daafa3309bb8c05a
ools_source.properties
6d42ec51f096747145b420f04934c8f234f32762 30-Mar-2012 Xavier Ducrohet <xav@android.com> am 767262f7: am 0738ab16: Merge "Add \'asset.dir\' property to build.xml"

* commit '767262f720a14928dc934b26d0f763cdb70fe5ac':
Add 'asset.dir' property to build.xml
0dd405184865862c480ad1a42f50692f32e94965 29-Mar-2012 Xavier Ducrohet <xav@android.com> Move tools and ADT to 19.

Change-Id: I3906416a7b5a4bf7b7e2f86ee3155c22d93a3c2b
ools_source.properties
332d32749d198af322500f776ef40c1412016e29 29-Mar-2012 Michael Zoech <michi.zoech@gmail.com> Add 'asset.dir' property to build.xml

The 'asset.dir' property was available in previous releases.
It was possible to set the assets directory that should be used in
the build process by defining 'asset.dir=../relative/path' in the
ant.properties file. Currently, only the "asset.absolute.dir"
property is available. While one can override this property with a
relative path, the name suggests that this shouldn't be done.

Change-Id: Ia421862c9eb736e3e1dfedaa8bdd4ff3e943941e
nt/build.xml
2d15c4298980be69c68c1a7d3a8bf264e7094469 26-Mar-2012 Xavier Ducrohet <xav@android.com> RS Ant support: split opt level per build type.

Also make sure the Renderscript files are rebuilt when the build type
(debug/release) changes.

Change-Id: I688fc3f8550e3133ee32de3ef074efa75ccc3b67
nt/build.xml
1cb06d5bc82268dc5c684aa2ee7415175ce14c7e 27-Mar-2012 Xavier Ducrohet <xav@android.com> Use our own signing code in Ant and don't rely on Jarsigner.

JDK7 changes the default signing algorithm and breaks release
builds where the ant script does the signing after building
the apk.
This changes the Ant script to use a custom task that uses
the same code that is already used to sign debug apps.

Change-Id: I0df7378a7a59b54ef6a17db363a2127736f4434e
nt/build.xml
5c9a5e6bd586c7b7c4e1e3b9f408663d35a850eb 24-Mar-2012 Xavier Ducrohet <xav@android.com> Output for proguard config in release.

Also tweak the level of our <echo> message which should be of
level INFO but the attribute defaults to WARN

Change-Id: I5f302400e24c250cada8fb883678264b57480615
nt/build.xml
36e49c5277ac346398d96d67c7ee5814bded8a5f 22-Mar-2012 Xavier Ducrohet <xav@android.com> Merge "Enable passing of debug and optimization flags to slang in Ant builds."
e19bfc666f085fd2bd10158d43735e9646663d44 09-Mar-2012 Xavier Ducrohet <xav@android.com> Add exclusion for Fragments in proguard.

Change-Id: I158e85a3c0a831788b11350ea7b33d41d9b5b0a4
roguard-android.txt
a08befd52438d523cb2cd41b53f961785d3872fd 08-Mar-2012 Xavier Ducrohet <xav@android.com> Ant build now sanitize jar files in setup task.

Previously the list of jar files was sanitized (to remove
duplicates) in the dex task, but this meant the full list
(with duplicates) was passed to proguard when building in release
mode.

This changeset move the sanitization of the jar files in the
Setup Task so that the script later only deals with a sanitized
list. The means the content of libs/*.jar for the current project
must be looked at in the task instead of later in the XML script.

Change-Id: Ib5253b80ee7c1ded004bcdad6184e0900b7a7543
nt/build.xml
de9dcb97c90a961f0e1500f5aea4be7501c4bc66 08-Mar-2012 Raphael Moll <raphael@google.com> Merge "SDK: generate repo using latest schemas."
314a75226677df8933fd38824e9510acde90fe87 02-Mar-2012 Xavier Ducrohet <xav@android.com> Only generate the libraries R/manifest classes in the app project.

If the project is a library itself then there's no need to generate
them.

Change-Id: I9896e2bac81979797cca10fc606c66e5139fc9a1
nt/build.xml
e70a66290663264c8990283924cf262107f68e7b 28-Feb-2012 Raphael Moll <raphael@google.com> SDK: generate repo using latest schemas.

Requires dev.git change I250fe7a3 to build properly.
Also requires Change Ia307af09 for addon.

Change-Id: Ib0363f06ce2754c58b5f2ba31c4f0720b933f0d8
ools_source.properties
4987af409c704c881be83f9a90b98ce7658e1c46 03-Feb-2012 Matt Kopec <matt.kopec@intel.com> Enable passing of debug and optimization flags to slang in Ant builds.

Change-Id: I8c6affe825b93eefb7ed60000740aa2783d93a20
nt/build.xml
f369217000a89786369810a177e3404f103c4874 28-Feb-2012 Xavier Ducrohet <xav@android.com> Never add R/R$* classes to the library jar files.

Previous change added excluding Manifest and BuildConfig but
made it so that it was only for the current app package.

The problem is that project that depends on libraries also generates
R classes for their libraries.
If the project itself is a library then the R classes from the libraries
would get in the library jar output.

If the main project had some diamond dependencies in its libraries
then the same R class from a library could be added twice to its
dex input causing an error.

Change-Id: I0ef4a3c3f84bf9099de27e275fa856b6c044978d
nt/build.xml
ee01dd0e2dfc082fbe4c5f73d0ea27df49e217a9 28-Feb-2012 Xavier Ducrohet <xav@android.com> Improve "ant all clean" to clean libraries only once.

This is done by going through the flat dependency of the main
project and not having the libs look at their own dependencies.
This is similar to what has been done for the regular build steps.

Change-Id: I597c8f931c231c5260cc5b33965b9938fe24c01f
nt/build.xml
da1c452fe47ca12fa89156531e78a3ab218fdbe9 27-Feb-2012 Xavier Ducrohet <xav@android.com> Ensure R/Manifest/BuildConfig classes are not added to the library jar file.

First, their are not needed there, second they can create a dx conflict
if the library uses the same package as the app.

Change-Id: I67b3f478d5d7ab79d02b6ece8b1eae31b8ed104e
nt/build.xml
baeef7fd3828cd609d7f6f8065466b706928dacb 23-Feb-2012 Xavier Ducrohet <xav@android.com> Fork javac on windows to prevent file locking.

On Windows, when using java 1.5/1.6 running javac without
fork=true can result in file locking preventing further changes
to them.

This changes sets fork=true in this case (win, java 1.5/1.6).

More info: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6558476

Bug: 24577

Change-Id: I6477ab0615c5a535b2011f2e9f40bc8f818f67a2
nt/build.xml
0bf1b2c94e8b3d829fd69d11f2efd550d6159cb9 17-Jan-2012 Tor Norbye <tnorbye@google.com> Split ProGuard file into two halves

This changeset splits the proguard.cfg into two halves:

(1) All the general Android settings go into
$ANDROID_SDK/proguard/proguard-android.txt.

This defines shrinking rules like keep custom views, etc. The
crucial point is that this information is maintained and updated
by Tools updates, so whenever new APIs are added to Android, or
whenever bugs are found in the configuration such as flags needed
to work with Dalvik, we can make the updates - we don't have old
snapshots living on in projects.

(2) Any project specific settings go to proguard-project.txt in the
project.

(3) The proguard.config property in project.properties now refers to a
*path* of configuration files, which are all passed to ProGuard in
the given order. The code which processes this setting will
substitute android.sdk.home and user.home variables, so the path
does not have to be hardcoded to point to the project-android.txt
file.

The default project templates have been updated to include a
commented out configuration setting up proguard as described
above.

The default proguard file name was changed from proguard.cfg to
proguard-project.txt such that it can be directly opened in Eclipse
and to make it clear it's an editable text file.

Lint was updated to find the Proguard file via the proguard.config
property as well as via the old and new default names for projects not
enabled with ProGuard.

A subsequent CL will add a lint check which identifies projects
containing the old setup (full local configuration) and offer to
replace it with the new setup.

Change-Id: I44b4c97a160114c2382f02f843c95486a0dc9d6b
nt/build.xml
roguard-android.txt
roguard-project.txt
roguard.cfg
a936605206127b6fb9d5b84192979ab30b146a80 07-Feb-2012 Xavier Ducrohet <xav@android.com> Add Galaxy Nexus to devices.xml

Change-Id: I22b4a05a2fee098aeb83b42101d5585a3933dce0
evices.xml
fa31b67e6e0f651cbce3c5bd5a8ac3b36e2bdc91 02-Feb-2012 Tor Norbye <tnorbye@google.com> Merge "Update default proguard.cfg file"
63bf713092680bc30c55ae5c62bd4200e3fef3e1 08-Dec-2011 Xavier Ducrohet <xav@android.com> Add post package and post build Ant hooks.

Change-Id: I3bae567328e1ba615df478cacca72667ef3e6359
nt/build.xml
7a0ef90574a34b5bc4e0699e47b23fc7ae753075 28-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 57bda474: am 19fe9514: am 1c148829: Merge "Add coverage filters."

* commit '57bda47408e8a78aab25a2d258aaf01b55d0058a':
Add coverage filters.
32456409b8351a80d55e3b94c2a25d7117c970aa 27-Jan-2012 Xavier Ducrohet <xav@android.com> Merge "Move the tools/ADT to r17"
19fe9514834c41c184911a6727440f8a39c65b67 27-Jan-2012 Jean-Baptiste Queru <jbq@google.com> am 1c148829: Merge "Add coverage filters."

* commit '1c14882983df1d5acd76014ae3816f40bfbb3bfc':
Add coverage filters.
4f9e5535976856938db771a6e52c957747b14834 27-Jan-2012 Xavier Ducrohet <xav@android.com> Move the tools/ADT to r17

Change-Id: I4989ce98d4c6a600ca075ee919e5a0e1a40a4497
lugin.prop
ools_source.properties
c16aec1100263d2e3449ba82d859b029c54007fb 26-Jan-2012 Keita Kita <maoutwo@gmail.com> Add coverage filters.

* Add exclusion filters prevent from including
generated R and BuildConfig class in coverage report.

* Add emma.filter property for filtering (inclusion and exclusion)
instrumentation.

Change-Id: I0b6764e5f60917d004b7b3335ac060e82921c603
nt/build.xml
a418de56908e413187e1144b7d1d430bbfc459d5 27-Jan-2012 Raphael <raphael@google.com> SDK: use new find_java.exe in SDK bat files

Change-Id: I9f3fc572c3af6d8457a75cebae1aa6a850511afc
ind_java.bat
5d30fda8305e92d85f10b4625e1322b4a6a592a2 12-Jan-2012 Tor Norbye <tnorbye@google.com> Update default proguard.cfg file

This changeset updates the default proguard.cfg file bundled with the
tools.

Change-Id: If7163a3b8855dd88a58a3e83bb05793733764209
roguard.cfg
e9fddda9eac133603d011265379fdceecebb4168 24-Nov-2011 Xavier Ducrohet <xav@android.com> Misc Ant build fixes

- project name on standard build rules
- allow override out.final.file
- allow passing custom javac parameters
- allow note having local.properties as long as sdk.dir is present anyway
- -pre-clean target allows custom clean build

Bug 21023, 21267, 21465, 21525

Change-Id: I4bee2f8c15fab664b1f4ff54d754920d2487f6c7
nt/build.xml
58fd50795e20449fcf880022a9debbbcb2357376 11-Nov-2011 Raphael <raphael@google.com> SDK Manager Windows: detach from java process.

This fixes 2 issues:
- A bug in android.bat was that the bat+lib were
only copied if the arguments were 'update sdk'.
However since Tools R14 the sdkmanager doesn't
use these arguments anymore.
- Consequently when invoked as 'android sdk' it was
not copying itself in the temp folder and thus
was locking the tools folder, preventing updates.
- The new behavior is to always copy, like that we
don't care how the app is launched.

- The SDK Manager.exe was launching android.bat and
then waiting for it to finish, capturing its
stdout in care there's an error to display.
That locks SDK Manager.exe and thus prevent from
updating it too. So instead we just don't wait for
the bat to finish, don't capture/display its stdout.
If there's an error, the user can still use the
command line version to find out what's wrong.

SDK Bugs: 21212:SDK Setup.exe [keeps] an open file handle
SDK Bugs: 11989:SDK Manager.exe should be able to detach
(it doesn't do the part where the sdk manager could restart
itself after an update though. I'll file a different issue.)

Change-Id: Id473ce58d3f36d417b6c0ee5f07a039adbbe06c0
ind_java.bat
d8ee1b032dafdbd2fbffea5c6cd11246ce595988 28-Oct-2011 Xavier Ducrohet <xav@android.com> Move tools and adt to 16

Change-Id: I79ae1bff5086146cc60b4496f4b0464ffd642651
ools_source.properties
6451786c0308ff01e8290eaeb874d0c9650949ec 22-Oct-2011 Xavier Ducrohet <xav@android.com> Add nodeps support to install/uninstall.

Change-Id: Ia03a4c55567680a8365df8a83079c7d370747697
nt/build.xml
fb1f0942dc96d0bb2ef1b8a44458f377834b35e5 22-Oct-2011 Xavier Ducrohet <xav@android.com> Fix ant test, ant installt and ant uninstall (for test projects)

Bug http://code.google.com/p/android/issues/detail?id=20979

Change-Id: Id861d493c9b73dcfc9e81bdc8fb6c8b7c8ed0e55
nt/build.xml
bf78416918ecca559263250e2d02967b8f067700 21-Oct-2011 Xavier Ducrohet <xav@android.com> Fix "ant test".

Change-Id: If7dab5116ec0351f712aa26673c3b3d36026bb96
nt/build.xml
b29886ed1a08c2d900ffb5fe4789db3701584d6d 15-Oct-2011 Xavier Ducrohet <xav@android.com> Rename the modifier target only to nodeps.

Change-Id: I26dc7be4f06758c0be7f4dbcbc358b805ba44945
nt/build.xml
a5613f269c976916f7125f58fa1dcb4f365e54b4 15-Oct-2011 Xavier Ducrohet <xav@android.com> Fix NPE when building project with no code.

The lack of dex file made the Ant package task throw an NPE.

Also some minor typo fix.

Change-Id: Ic617ee66017c402f211f5400baf5a00eb7e6cff5
nt/build.xml
def6f0d2e24d6dd96d6265fcf05fd9a1e10c789c 15-Oct-2011 Xavier Ducrohet <xav@android.com> Improve indirect library dependency support.

Previously with the following setup:
Main app depends on Lib1, Lib2.
Lib1 and Lib2 both depends on Lib3.
Lib3 would be compiled 3 times, as the main app would attempt
to build it and then Libr1, and Lib2 would do it too.

Of course it wasn't actually built 3 times. After the first time it would
do nothing, checking dependencies and do nothing. However, for projects
will a lot of libraries and a lot of indirect dependencies this could
slow down a lot compilations, as the build would spend its time checking
whether to build the same library many times.

This ensure that only the main project attempts to build all of its library
dependencies (direct and indirect), in the right order of course.
When libraries are built they are told (through the "only" target) to not
build their dependencies.

Change-Id: Ie80f32a96e3c473d897aca5d05bf6fe9ea086884
nt/build.xml
e162064a7b5db1eecec34271bc7e2a4296181ea6 14-Oct-2011 Xavier Ducrohet <xav@android.com> Add BuildConfig to ant SDK project.

The BuildConfig class contains a single boolean constant
called DEBUG which is true only for debug/instrumented builds.

This allows developers to create debug only code that's automatically
stripped from release builds.

Also fixed some issues with dependency check for other tasks, notably
the aapt task that would always find new files due to not filtering
out files that are ignored by aapt itself (hidden files, version control
files, etc...)

Change-Id: I4391a87c064a185d6b337ca46e3a9f0e43c5174d
nt/build.xml
b92742797f979667fad027e35e04efff6e7df0aa 11-Oct-2011 Xavier Ducrohet <xav@android.com> Improved RenderScript support in SDK build.

- renderscript output is now in bin/res/ instead of res/
- Ant build system properly handle dependencies to only recompile
files that need it.

Change-Id: Ic2cd4487a26e7a7fcb0b475ee52fa0ccf8a07c0b
nt/build.xml
26d92b7f8a7b8a32352f52a676f486c06e5b82c8 07-Oct-2011 Xavier Ducrohet <xav@android.com> Ant build didn't use -non-constant-id for libraries!

Change-Id: I966b8796008b87dd3e6101d8c6d09271e2621c52
nt/build.xml
6a5504251e5b089d0a41e71fc35f8c7a4bfae635 04-Oct-2011 Xavier Ducrohet <xav@android.com> Make source.prop more important than build.prop when parsing platforms.

Change-Id: I715a7503a7be2b28cd89bd441b8cbb5ee620ccac
evices.xml
78c89f931135c11c45f26590ea5ae29577bced85 29-Sep-2011 Xavier Ducrohet <xav@android.com> Also process and cache the png files in libraries.

The png in the libraries were not processed by the crunch step.
Because aapt never processes png files anymore (relying on the crunch
step to do it), the png files in libraries were never processed.

While this is less a problem for standard png files, this completely
breaks 9-patches that must be processed to actually behaves as 9-patch.

Change-Id: I0a1fe14ea34f6d36a368b456494410945afc3c44
nt/build.xml
a1760eb02098b21f1aa37a293a488a1ab4bdb823 28-Sep-2011 Xavier Ducrohet <xav@android.com> Tools r14 require ADT 14.

Change-Id: If07afb667f0b748e859e2e8b70aa1bcc74f0acfe
lugin.prop
5d9df469ba3662afefa78447c323cdfccb40b60b 23-Sep-2011 Xavier Ducrohet <xav@android.com> CherryPick 15fa2c from master. do not merge.

Make the zip align ant step check timestamp on intput/output.

If the output is more recent than the input, zipalign does nothing.

Change-Id: I51146f0da9697e8f8bfc19e4d6bea80006f101b5
nt/build.xml
0802f23053c774a0ed8d122532a9694f742cc74f 02-Sep-2011 Xavier Ducrohet <xav@android.com> CherryPick a9a282 from master. do not merge.

Add dependency support for ApkBuilder ant step.

Change-Id: Ia51f745f3bb0a91bafe0396804b999a0e39578ea
nt/build.xml
1e0661b57dd8c7226c50e558dd89ecbda5276ecf 17-Sep-2011 Raphael Moll <raphael@google.com> Build AVD Manager.exe as part of Windows SDK.

Also make sure the sdk manager post install will
update the AVD Manager as required.

Change-Id: I969899adf69f0ed0ddb1ef079451683dd0ce567f
ost_tools_install.bat
91308ed41e99d6d6ffb6117740c3debdd4e08764 16-Sep-2011 Xavier Ducrohet <xav@android.com> Pass -target-api to the renderscript compiler.

This allows to use a single llvm executable to target
all API versions.

Change-Id: Ib27f7fc9e54c548d31fc98fc323f439cb99218d5
nt/build.xml
cb43be0ec5d10e11032d710de9c325de0ef40d03 02-Sep-2011 Xavier Ducrohet <xav@android.com> Merge "Make the dependency graph use extension restrictions per folder."
9946464cb7a1c9160e7411dd6f7b8a87cd151ac7 02-Sep-2011 Raphael Moll <ralf@android.com> Merge "Windows: look for Java in %ProgramFiles(x86)%."
0fd7983848915b9424501afee8d8f0ea6f08f858 02-Sep-2011 Xavier Ducrohet <xav@android.com> Make the dependency graph use extension restrictions per folder.

Before there was a way to filter touched file by extension(s) but
this was for all input folders.

Now each input folder can have a different set of extension restrictions.
This will allow apkbuilder to use DependencyGraph and extension restriction
for all its input folders.

Also fixed an issue where aapt would not package the resources if an
xml files was touched. This is because it didn't make a difference
between compiling the resources for IDs and packaging the resource
values.

Change-Id: I797d3a24c6c1f999e9d412c4ff8aa826ed16fc09
nt/build.xml
891cbf7552f98af2f0baaed069b5eb64de50c556 26-Aug-2011 Xavier Ducrohet <xav@android.com> Add proper dependency support in the dex step of the Ant-based build.

The dex step now generates a dependency file that is reused during
following builds to check whether dex should occur.

Also optimized the part that figures out if any dependencies have
been modified/have gone missing.

Change-Id: I7f6e915fc7b571ad973260daa506badced3a9c2a
nt/build.xml
50b3e57fa887dc7182facfb178ef842103aeeaf3 23-Aug-2011 Xavier Ducrohet <xav@android.com> Add support for proper dependency detection in the aidl ant compilation step.

Aidl compilation now generates dependency files that are reused on further
compilations to only recompile files that needs it based on source files
modifications.

Also clean up output (and dependency) files when a source file is deleted.

Change-Id: I3131463fd7939ffc4b5bbdfa49940e03f0249a28
nt/build.xml
11583ccac791c5bb13a3c7bf98e5031d8e7eee9f 26-Aug-2011 Raphael Moll <ralf@android.com> Windows: look for Java in %ProgramFiles(x86)%.

Cf bug 19551.

Change-Id: Id5ce9b0e792e7e189f9fc12e0dcfc6a63e0e2704
ind_java.bat
3b5a006ce53d82ab324af836c3abeacc0a77acc1 24-Aug-2011 Xavier Ducrohet <xav@android.com> Prevent running debug and release targets at the same time.

This is not possible since they rely on the same properties which
cannot be updated after they are set.

Change-Id: I2fbc0f53b656f5906c2b026d8fd41d78a4461803
nt/build.xml
9aa55ba53817062f7423dbc69716020bd052c394 22-Aug-2011 Xavier Ducrohet <xav@android.com> Renable test coverage from Ant.

Added a warning regarding the requirement of a rooted device.
Also made it so that the test can be run without having to build
and install the packages with just "ant emma test"

Change-Id: Id643b5f56585954b91c9c85c3eb33c4ef31c196a
nt/build.xml
500626591f654188776a0b66b70110a1b7b1a811 18-Aug-2011 Xavier Ducrohet <xav@android.com> Don't regenerate R.java if a non xml resource is modified.

Change-Id: Ie28359234cbb56e14c42274434831e4795bf3ee3
nt/build.xml
395b6b763ffedb662516babccabda87074e4e56a 18-Aug-2011 Xavier Ducrohet <xav@android.com> Rename main_rules.xml to build.xml

This is the final name. I kept main_rules to make the previous
review easier.

Change-Id: I3dfcd36a49f2893665e712ed9391acb4486d713e
nt/build.xml
nt/main_rules.xml
babf25ca7162849f0145f75be1b6c09b359b122c 15-Feb-2011 Xavier Ducrohet <xav@android.com> New library project mechanism.

Libraries now generate a jar file that is used by the projects
referencing them, instead of having the main projects compile
the library source code themselves.

This means we can remove the link mechanism that created linked
folder in ADT and instead use a container that is lazily initalized
to be all the jar files of the libraries.

Also merged all 3 Ant build files (main_rules, lib_rules, test_rules)
into a single build.xml that can build any kind of projects.
Lot's of improvement in there too. Much cleaner.

Change-Id: I98307e25cd76722e8595938528e6ef57a7e226ad
nt/lib_rules.xml
nt/main_rules.xml
nt/pre_setup.xml
nt/test_rules.xml
8baa0f19ccfd5ea6d1c7e377d5cbc4dc1a71f2c7 02-Jun-2011 Tero Saarni <tero.saarni@gmail.com> Expose version.name property for aapt task.

The new property makes it possible to create ant build scripts
that programmatically determine and set the versionName attribute
during build. Similar property already exists for versionCode.

Signed-off-by: Tero Saarni <tero.saarni@gmail.com>

Change-Id: Ia36632ae029785563fc7c1bc8937034963016852
nt/main_rules.xml
c5f5a6ed7e58d38d1d4f1a39284536678981361e 03-Aug-2011 Xavier Ducrohet <xav@android.com> Update tools/ADT to rev 14.

Change-Id: Id29498fde61185a63812b7267b64560a8fd54dc5
ools_source.properties
c15b4fdc76142c61db1ec29feb2afdfaea43a84b 08-Jun-2011 Josiah Gaskin <josiahgaskin@google.com> Add support for aapt CrunchCache in ADT and Ant

This change lets ADT and Ant use the crunch cache system
set up in change I58271fb2. This commit is separate because
sdk and framework are separate git repositories.

Change-Id: If2828d157acad0b5adb812001e777c199e3c62fe
nt/main_rules.xml
8eed839480712a84f2cab6ff410c73ce84f3b2dc 20-Jul-2011 Xavier Ducrohet <xav@android.com> Merge "Add 7" tablets to device list used in the layout editor."
08a87da879d2092525aab53b510b0be4f65cc15f 14-Jul-2011 Xavier Ducrohet <xav@android.com> Add 7" tablets to device list used in the layout editor.

Change-Id: Ib46d23c1ad85e2b0b4b77040cd3498051c79e926
evices.xml
a9dcfb3777eddee860ddb59f5ae77a611ffab63a 12-Jul-2011 Raphael Moll <ralf@android.com> Properly support spaces in ant project directories.

After applying https://review.source.android.com/24515 for
the dalvik/dx change, this allows ant project to build
correctly on Windows if there's a space in their directory
path.

Change-Id: I4c6d5f87fae2dcf2955698633a16a0bde501694f
nt/main_rules.xml
9b205d7f8cb7c0c23b1c6c212d83cb614e5342b4 21-Jun-2011 Xavier Ducrohet <xav@android.com> Move tools to 13.

Change-Id: Ibedcb5627170d107cacf5e9d212f9da11c8d1f3e
ools_source.properties
aef49b24c2f64357b901793dd102e18e7bd566ed 10-Jun-2011 Tor Norbye <tnorbye@google.com> Fix proguard template to avoid shrinking XML-only references

See 16384: ProGuard template generated by the ADT is flawed

Change-Id: I6ebbcf059bbee8c485747dcee55f4ecfa14b6831
roguard.cfg
69a8290d3d3aeb0a5b481113730ce76180b91384 07-Jun-2011 Xavier Ducrohet <xav@android.com> Move tools to r12 and ADT to 12.0.0

Change-Id: Ifcf5190547e9e37bdda766ad3d57a312c2dbb481
ools_source.properties
21b7ce23b4280350aaebba3ed3d480d74f07fc2b 11-May-2011 Raphael Moll <ralf@android.com> Fix space-in-dir issue with Proguard for the ant case.

This fixes the proper way to quote the compound paths
arguments given to proguard. Each individual path is
quoted if it contains spaces.

Quoting for -libraryjars fixes the issue for the SDK
install path containing a space.
Quoting for -injars and the other arguments fixes the
issue for the project path containing a space (although
the ant build will fail later at the dx phase in this
case.)

Change-Id: I74283b4f1b19c353c1a5ed36e4d0ec58676b6a79
nt/main_rules.xml
c1458ffdc3d82ae0c19bd5b65b19972b49c0365f 10-May-2011 Raphael Moll <ralf@android.com> Fix proguard wrapper to capture all args.

Change-Id: Ic926f3d5c39a3f14c9a54de70576c94508acf2ba
roguard/bin/proguard.bat
705838f2d4aa4d41d57e7ea79c63183f9aa920eb 21-Mar-2011 Xavier Ducrohet <xav@android.com> Better default selection when choosing a device config.

Change-Id: Iacaabec4ad9e9dd55397dc2cc3e6bfadc0c11ff2
evices.xml
87033a58d604af63b580262811b947ff4bd15785 24-Feb-2011 Raphael Moll <ralf@android.com> Add min-platform-tools-rev to the tools source.properties

We need that info to generate the repository.xml since it's
a mandatory attribute in the XSD.

Change-Id: Ic341687f07f8d91182d680cd1d3b35e431c38670
ools_source.properties
040afb495e9f5ca27bbbdcc2f4316ac1738d5e26 11-Feb-2011 Xavier Ducrohet <xav@android.com> Move tools and ADT version to 11.

Change-Id: I4ba19e12a7d11df3d3c1053c30f3998a93b5fb06
ools_source.properties
96f99e924b2e0d1de50418036f2bfc369b89d688 08-Feb-2011 Xavier Ducrohet <xav@android.com> Ant tasks and dependency clean up.

Give anttasks.jar a proper manifest with jar dependencies.
Update the manifest of sdklib.jar with the common.jar dependency.

The pre-setup section of build.xml has changed over time
and really we should be able to control it so move it in
$SDK/tools/ant/pre_setup.xml and import it into build.xml

Change-Id: Iab707deccc0cdbe8d1a9db052ee6fb0762853394
nt/pre_setup.xml
3b9fbaa2c4214b779fde7e2759ac04f0f8f0ecdf 08-Feb-2011 Xavier Ducrohet <xav@android.com> Tools r10 require ADT 10.0

Change-Id: Ide739f4e3edddb3ab04519262eee34d28e18bd16
lugin.prop
68d0fb4cbfa47402910027c97bc91410da75ea10 11-Jan-2011 Xavier Ducrohet <xav@android.com> Add renderscript support to the Ant build system.

Change-Id: Iba1c956d33725716923da89b788f7f8d14524e41
nt/main_rules.xml
2afb28704a1d522aa17a9921a1643e2797c78255 19-Jan-2011 Xavier Ducrohet <xav@android.com> Merge "Parse the manifest min/targetSdkVersion to configure the layoutlib."
0ddea1d8398170714d19f9032e6c612ae2599894 19-Jan-2011 Xavier Ducrohet <xav@android.com> Move SDK Tools and ADT version to 10.

Change-Id: I6cfde67f2d0a0da2f94124d19e152e99df349820
ools_source.properties
72d9dbce0d832fab74258f2fb2f69e4f73d51066 18-Jan-2011 Xavier Ducrohet <xav@android.com> Parse the manifest min/targetSdkVersion to configure the layoutlib.

This is needed to configure ApplicationInfo in the layoutlib
so that some widgets properly apply different behaviors based
on the app targetSdkVersion.

Change-Id: Ic78af4390d1b871469583f3efc0de3a9da718a6c
dk.properties
880899162070e7e3eed85fc0b8f68eede1776f2c 12-Jan-2011 Xavier Ducrohet <xav@android.com> Don't reopen a layout if it's already opened.

This is for the case where a layout is opened
and Eclipse tell its editor to re-open it because it was
double clicked again in the package explorer due to the
MatchingStrategy having returned true.

Change-Id: I404494b990215bcdff163a382ecb411e2efb9b51
Misc: reorder configs for the WXGA device config.
evices.xml
d2af72629214bef700604ef986dc8ca4160884b7 11-Jan-2011 Xavier Ducrohet <xav@android.com> This is tools r9 in tools_r9. DO NOT MERGE.

Change-Id: I4d6d8cd74abd2cb3b9087ac4f30b761d803e15e3
ools_source.properties
b4ac5666c837b76d3dded1b64eeab9bba50a0a15 07-Jan-2011 Xavier Ducrohet <xav@android.com> Fix layout device list.

Change-Id: Idb6b0f654cd11225faceeb5b0541703623a0ee83
evices.xml
503f45ca639c347a36750ba4cc33ae6818c64687 28-Dec-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I31f069bc3e50c895162d15b4d0d5851a4d380fda
d41056081f297a78fcc3763e194138351e6a4481 23-Dec-2010 Raphael Moll <ralf@android.com> Add readme regarding move of adb to platform-tools

Change-Id: I861a1b02a3abb1bb1f9120bbd25f3d4ffd949e9e
db_has_moved.txt
76eaf93d2717f2a90261636d945eaa767474210d 14-Dec-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I9036a5154f006f1f6ba6685b9b8985db07a66ed0
81523956d4ba59c1bbf01d58f9c683f2212b28fa 10-Dec-2010 Xavier Ducrohet <xav@android.com> Move to rev 10 and update change log

Change-Id: I477033c03a40c52d26b73efa892a65feafaba680
ools_source.properties
4402d2e9f7fb7068e48c4bad15f715533feb85a3 09-Dec-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I377761c7b5568f9e66331540b8db82f08a09c1eb
3cbafc8799e4bb8bb1149f94f51c305192be8414 09-Dec-2010 Richard Lowe <richlowe@richlowe.net> android.el: Make android-uninstall-app not reinstall

- uninstall, rather than reinstalling the app
- Fix reference to argument

Change-Id: I66afe170c1d0ce2e5acfccf7a0c635fd07764f32
ndroid.el
3225819eb75711cfe46ef99f1a4f1508fcc088ac 06-Dec-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I5a05ec6c6dca06af72779d6c4d66efcaba8abd10
a3d14e0800ba730ab2ed0f33cf25acd0fd9968db 06-Dec-2010 Xavier Ducrohet <xav@android.com> Fix ant rules

- utf-8 is default encoding for java files.
- make encoding, target, source also overridable in the lib rules.

Change-Id: I95a6dfd2a815ea9994638c0a0270381819b75a12
nt/lib_rules.xml
nt/main_rules.xml
8861ea6b05d7e1d4ab09229771f5e1d1e768f697 16-Nov-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I717ec549d6917bc238a3517c091cfcca0609ef8c
88dcd9a530f1bbc5cfec1621f6f749a984661a49 15-Nov-2010 Xavier Ducrohet <xav@android.com> Add preferences to the list of not proguarded classes.

Change-Id: Ib7db435bb640b3a3feaa0534ccc77b6f9eda0800
roguard.cfg
dafebc2cbb59de04ebffc8553b896ea6fdafa6d3 15-Nov-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ife73a3a44823869ddc2536650aa8f68bbb1f5f45
e7af4c0350b19394308c197e8766d4ac79e788ac 15-Nov-2010 Raphael Moll <ralf@android.com> Exclude BackupAgentHelper classes from Proguard.

To use the Backup API in Froyo, an app needs to typically
extend this helper class and the class is only referenced
from the AndroidManifest.xml, so ideally we should exclude
such classes from Proguard by default.

Change-Id: I690220d2e89a8ff6d0664be93dad55da8b7b66c2
roguard.cfg
ab1bbd459feb0c3832d2b51bd24d76ed47378cf8 28-Oct-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I8115fa4f83035d6a5aa59bcb0a5603f38f99a59b
68c1563b708276d396773e47effc28fb2d5e1a16 28-Oct-2010 Xavier Ducrohet <xav@android.com> Fix adb location in ant rules.

Change-Id: Ia8188de0b8af0ec4474f5c4ca2cec294c077e03f
nt/lib_rules.xml
nt/main_rules.xml
89bdaa02a786c3b7de1aa21654bc16c4951980e1 26-Oct-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I51c83c375936259d6ebe3efabd77eb1f46805236
35fb4c64c629d531ab7ada395131ae3e7cc26e8b 25-Oct-2010 Raphael Moll <ralf@android.com> SDK: Fixed proguard.bat & co.

These are similar to the external/proguard/bin/*.bat
except they use $SDK/tools/lib/find_java.bat to locate the
java location and use it if available. find_java will print
a proeminent error if java cannot be found.

Change-Id: I1fceae838436053031f405de9b3f1ab2d64222e6
roguard/bin/proguard.bat
roguard/bin/proguardgui.bat
roguard/bin/retrace.bat
fccdb80681bb8033b2ab2be89701eb5fa1036821 26-Oct-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia61cea62f72a18aea3d908c90c90af9a517ed659
a6324a21d1912144ed4e468ab5e127169992ab6e 25-Oct-2010 Xavier Ducrohet <xav@android.com> Fix external jar support when building with proguard.

Change-Id: I3dafb284770f475d70a212cbe22cdae6bff36ff7
nt/main_rules.xml
c745347efe3e50623f744d5e422a71ab8bff3a5e 11-Oct-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I1e69603b2d46eb071822dc7fac667bb02649e15a
4720907ab4bbd88eceb040cb25eab343188de547 11-Oct-2010 Xavier Ducrohet <xav@android.com> Merge "Display SDK/plug-in incompatibility messages."
2af6007ca92b98f844378e31807f22d237fe481e 09-Oct-2010 Xavier Ducrohet <xav@android.com> Display SDK/plug-in incompatibility messages.

Hmm this used to work. But the lines displaying the error
messages are gone...

Change-Id: I83cf7d3e8a471fe6b2166818db9fad4f60d3d392
lugin.prop
c4fc23757deb6f5b045e8a7c79493941977e8c26 09-Oct-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I512ca46b9579f24774b1a56f8d5531a150d090b6
a89eaf966690ac71c75b277a065449294545908f 07-Oct-2010 Xavier Ducrohet <xav@android.com> Proguard default config file.

It is located in $SDK/tools/lib/proguard.cfg and automatically
put in Ant project (create and update if project is not already setup
for proguard).

Change-Id: I9bcb2a5aafec1329b0c001799f4ba34c61569c3a
roguard.cfg
2c8fbcb45671043fdfe1fc8bcda6b8603c298e61 01-Oct-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ic53d217bf6b2008bb394f31aac8441a99e449201
e0df3f1e3dd9e5cfc63750748a220ef14893e9f4 30-Sep-2010 Xavier Ducrohet <xav@android.com> In some cases release build is actually a debug build.

If the manifest sets debuggable=true then this override
the release build to be a debug build instead.

Change-Id: Ib66bf9053cecfa7c19a02cefdbf187a20bd6da37
nt/main_rules.xml
882db2aad5e89505733c7fb9bfda9ba139412fa1 27-Sep-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I042d0153b76bd8b164a815165f80d29b4ed94df2
c83ab24062531e9aa2b166596e954375fb53492b 27-Sep-2010 Xavier Ducrohet <xav@android.com> Ant doc on how to replace proguard.

Change-Id: I27faad2282fbe6cff565d945c2b64d42d31db1fe
nt/main_rules.xml
23ca51ca7585fc12301185885df4ed32b3130c18 25-Sep-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ie20ef0aec822d00c70e9bb1764002cd624b4ae38
df70e0290f9634aa0431917c59912607bb15313a 24-Sep-2010 Xavier Ducrohet <xav@android.com> Make it easier to use a different obfuscator.

Change-Id: I3fb80a8b91482de5117a9e093b2d50010bb99546
nt/main_rules.xml
a66ca8ad997527af0e7a07ba851da0a6d379fad0 17-Sep-2010 Xavier Ducrohet <xav@android.com> Use proguard for release builds through Ant.

This is only activated if default.properties contains
a property "proguard.config" with the name of a proguard
config file.

Some clean-up in the Ant tasks and in the name
of the properties used by the rules and the custom
tasks to make them clearer.

Added a new test app with a project using a jar file
as well as a library using a jar file.

Change-Id: Ia8f4d873025993d454c0a484e61d47ae679ea79c
nt/main_rules.xml
4a0478d54b93ee057644e0d700bcc995ce15689c 24-Sep-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: If12bf352bc918d9f874e619bb5b3053c755c9699
ddfe27973764d82001d52d5ba8306af8f2e79fee 24-Sep-2010 Xavier Ducrohet <xav@android.com> Make javac ant options configurable.

Change-Id: I303acdb4fc8de6ba5d8de7c18e020e97fe01e3de
nt/main_rules.xml
e5b3ad0151c34de658c24d8e8876eff794d289eb 11-Sep-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I7f8d4353f2905aa5de511e61f4d0f13e0bc4ddc6
0a3b9b3c4e73abf826866cec9fca394d690caed2 11-Sep-2010 Xavier Ducrohet <xav@android.com> Fix test ant rules.

They were importing the old name of the main rules.

Change-Id: If5d591d48f420e5bd8a24843c99befdbb487cd80
nt/test_rules.xml
bbbedc8a8ad5dd5de09d60327c4ff324b66b2e9e 03-Sep-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I75d0a0bb0dc46dc1823d5fc2ca609d3a26a5f91b
5af43ecb4e1621cb55cdda4074c11cd9009ae2b2 02-Sep-2010 Xavier Ducrohet <xav@android.com> Support for debug build in Ant.

"ant debug" now automatically insert debuggable=true in the manifest.

Also cleaned up a lot of the Ant stuff (versioned Ant rules, support
for importing different rules files based on compatibility computation).

This is rendered moot with our new single aapt executable. The ant
rules will now evolve alongside aapt, and there will not be mismatch
between the two.

Change-Id: Iaf309f40e6ab4a0204dfbdb428cfb569bf5ca3b3
nt/ant_lib_rules_r2.xml
nt/ant_lib_rules_r3.xml
nt/ant_rules_r1.xml
nt/ant_rules_r2.xml
nt/ant_rules_r3.xml
nt/ant_test_rules_r1.xml
nt/ant_test_rules_r2.xml
nt/ant_test_rules_r3.xml
nt/lib_rules.xml
nt/main_rules.xml
nt/test_rules.xml
dk.properties
465b5ec74f5cfb9ec276b20df71adc951190f04c 31-Aug-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Id6d2e8d96b34ecbdd611c7eb19d0bb62655f888a
ba6508c7edcd34d9daa8bc373d44040e13072b01 31-Aug-2010 Jean-Baptiste Queru <jbq@google.com> resolve conflict from tools_r7

Change-Id: I5f416c6e77def15fdc6ae1022bbfe3033a6992ef
7a12704dcdebc28cd728f2b2ebc9e8115b9c6985 27-Aug-2010 Xavier Ducrohet <xav@android.com> Add Ant property when in release mode.

Also fix some NPE in usage of ISdkLog.warning

Change-Id: Id2803f7692b82d0d2f5dea49f17f916509a7b205
nt/ant_rules_r3.xml
3207e1053df9eead72fdd85e3314ab2f99cbc563 24-Aug-2010 Xavier Ducrohet <xav@android.com> Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"" into tools_r7
32b91a43988aded74942040418744cf6beea7bb1 24-Aug-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Ia55cfd4c49a26447d06124b4505eeff73e5998e1
859fa3ad3a72dd3cd140785c8b7b4dc166ae8cb8 22-Aug-2010 Raphael Moll <ralf@android.com> SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"

Merged from master to tools_r7

Change-Id: Ib8e702344dd2d593d7f7e6d56b0c3534480ff376
ost_tools_install.bat
695bf7bd3e88d2fcd40ac7c02208c4ae602bd826 23-Aug-2010 Xavier Ducrohet <xav@android.com> Improve capability of the post-compile target.

Make the dex target use a different property to read
the input folder for classes to dexify.
By default the new property has the same value but can
be overriden if a post-compile target modify (obfuscate)
code into a different location.

Merged from master into tools_r7

Change-Id: I1fe2fd2a2678d8c4354702250cea1481f74dd7cf
nt/ant_rules_r3.xml
0e32c500b375fb2191e94f230522469294eb4066 24-Aug-2010 Xavier Ducrohet <xav@android.com> Merge "Improve capability of the post-compile target."
067fb11c156849793e2801e3c4dd78143faf0e74 23-Aug-2010 Xavier Ducrohet <xav@android.com> Improve capability of the post-compile target.

Make the dex target use a different property to read
the input folder for classes to dexify.
By default the new property has the same value but can
be overriden if a post-compile target modify (obfuscate)
code into a different location.

Change-Id: I9caeca9f342c7ead1dcee9b4d80cde4ad741a843
nt/ant_rules_r3.xml
968e2cdf1e8be272d6905370bcf7e30b8cb4e184 23-Aug-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: Iaf2f7de891f78af2eddd7a5edc6e8d5bcc4e0b48
ad578ac1756c96a0dbf520867b9c9c95bd366b6f 23-Aug-2010 Raphael Moll <ralf@android.com> Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe""
0913421ffd4ab078bc2f9472c73f1e5bbf9525c4 22-Aug-2010 Raphael Moll <ralf@android.com> SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"

Change-Id: Id62b59e75e92fe14376353211dd59d89f4ee63c6
ost_tools_install.bat
1fd72eac498ea552011b55afc9439c1cafe2e0f1 23-Aug-2010 The Android Open Source Project <initial-contribution@android.com> merge from open-source master

Change-Id: I01a81355942ab0a11c257fd4ffa11b6db2e71e8e
2ec0c5e1cb49b46fe3ab03f3397b1dd354f6c004 21-Aug-2010 Raphael Moll <ralf@android.com> Android.bat support for Java 64-bit.

android.bat: properly encode file using CRLF (not Unix mode).
find_java.bat: properly check for Java in the 64-bit ProgramFiles path.

Change-Id: If4a106f144b5b890a62fc5543b35df85ab5ab06c
ind_java.bat
a5dd8657133451adc281d848a5fd39791487a1c3 21-Aug-2010 Raphael Moll <ralf@android.com> Android.bat support for Java 64-bit.

android.bat: properly encode file using CRLF (not Unix mode).
find_java.bat: properly check for Java in the 64-bit ProgramFiles path.

Change-Id: I78adb4783955cfad867d29f66d7ee58a017d41c4
ind_java.bat
df445ded052693dd018c29c7be5ce79266d75829 12-Aug-2010 Raphael <raphael@google.com> ADT: support xlarge resource configuration.

Also added a sample device configuration for the layout editor.

Change-Id: I1ec540038d2676e1f924e74f7f2aa8000d3672b3
evices.xml
3a91ca8579e3de22071d91b5f2c006aa0fa4aa8c 22-Jul-2010 Xavier Ducrohet <xav@android.com> Move tools to r8 in the dev branch.

Change-Id: I703a4a52c0f2e76c5b19103f3b43ef203472006c
ools_source.properties
5da0801262e107975db7ebdfdb025b7724f03a31 09-Jul-2010 Xavier Ducrohet <xav@android.com> Add new default devices to the layout editor.

Those devices represent one of each res/density combo for officially
supported screens.

See http://developer.android.com/guide/practices/screens_support.html#range

Change-Id: I6b8348ae1ab96b6b1f27fa2afd655ff6f3866dd8
evices.xml
345353594f7eebc5a04a20bef2b6dd581e09c364 28-Jun-2010 Xavier Ducrohet <xav@android.com> Ant support for library depending on other libraries.

Change-Id: Ief8261327f7917d158fc8ad4dd4e4c3d322bbce2
nt/ant_lib_rules_r3.xml
5aea83e90d706a4f14082be562d9d310f171e8c2 26-Jun-2010 Xavier Ducrohet <xav@android.com> Support for aidl files in library project in the Ant build system.

Change-Id: I3e36e6f4db60d3d979b24c2b88d496f453394127
nt/ant_lib_rules_r3.xml
nt/ant_rules_r3.xml
33075610a7696df4d5e986d7b705f8da2a7e9ffd 22-Jun-2010 Xavier Ducrohet <xav@android.com> Add support for Dock, Night mode, and Navigation state resource qualifiers.

Change-Id: I6b84248354c48accaed4baab7d9c12d8757a335b
evices.xml
ce57d70d01a8aa4e7f3e60ec4bbdd059f05fa0fb 28-May-2010 Xavier Ducrohet <xav@android.com> Add support for adb.device.arg to the test Ant rules.

Change-Id: Idfc39bcdd79f17700952bb66ed1b67a840495011
nt/ant_test_rules_r3.xml
2cc3f070f6c52ecaa93aeb3d97383919ff5f1ceb 08-May-2010 Xavier Ducrohet <xav@android.com> Override local keystore/alias info when using export project to export.

Change-Id: If4f188591b8c5154be894fdd1872a182d1b6eadc
nt/ant_rules_r3.xml
0a958e76e9406faed2c76d44557c678a6caa7081 07-May-2010 Xavier Ducrohet <xav@android.com> Add support for code-less project.

Change-Id: I09e8e5b40df3b8da4b34fe4f000e98263ea5bc55
nt/ant_rules_r3.xml
95c454979ae3608d1b3f26e21f7e2b4aeabba2fe 05-May-2010 Xavier Ducrohet <xav@android.com> Move all Ant rules under sdk/files/ant

Change-Id: I7533b52a56c00502dce8798bf31ac50444543446
nt/ant_lib_rules_r2.xml
nt/ant_lib_rules_r3.xml
nt/ant_rules_r1.xml
nt/ant_rules_r2.xml
nt/ant_rules_r3.xml
nt/ant_test_rules_r1.xml
nt/ant_test_rules_r2.xml
nt/ant_test_rules_r3.xml
nt_lib_rules_r2.xml
nt_lib_rules_r3.xml
nt_rules_r1.xml
nt_rules_r2.xml
nt_rules_r3.xml
nt_test_rules_r1.xml
nt_test_rules_r2.xml
nt_test_rules_r3.xml
4737bced9d780ded28d968982b25875113716046 05-May-2010 Xavier Ducrohet <xav@android.com> Add support for signing in the multi-apk ant build.

Change-Id: I0b0223b7fa5275995563a1a21192941bd72811cc
nt_rules_r3.xml
711c35d7e18a262cde3800eecec26d52a25d532a 05-May-2010 Xavier Ducrohet <xav@android.com> New If/Then/Else custom Ant rules to simplify some Ant rules logic.

Also cleaned up some attribute of our other custom tasks to conform
to the standard convention (all lower case, all those were new in r3)

Change-Id: If328a8eb2448d95bee1f1b70928d72fde5014eeb
nt_rules_r3.xml
7733166d317c2f13548ee6c7509fc0e1dbbffe03 04-May-2010 Xavier Ducrohet <xav@android.com> Fix displayed message in some ant targets.

Ouput properties were renamed from *.package to *.file

Change-Id: Id6885951f630a0507df0d68298778cd4cc64a4ad
nt_rules_r3.xml
46ab30305305c61213385dbc2e6779da0101a50d 04-May-2010 Xavier Ducrohet <xav@android.com> Fix the Ant test rules r3

They were created from the wrong r2 file.

Change-Id: I62dc6c631cc7c1fdac6dd7ba57a776bb576e3c1f
nt_test_rules_r3.xml
114ca22329320d7f43af219b473d4c2461e82e7d 29-Apr-2010 Xavier Ducrohet <xav@android.com> First step of multiple apk support.

- New export type project to handle exporting a single app represented
by multiple projects (for different minSdkVersion for instance).

- Cleaned-up the current Ant tasks and Eclipse builder to not
deal with ApkSettings anymore. It's not possible to generate
more than one APK in a single pass. The export project will
handle this and call out the normal build system to export
each variant. Make older (deprecated) attribute actually
output a warning.

- Ant rules r3 now with support for multi apk export. Lots
of clean up, add new properties to be overriden by the
multi-apk export task, make older one overrideable too.

- Better handling of older rules, older tasks, etc...
in the SetupTask used by the normal build.

- Add split by ABI to ApkSettings and use it in the
new multi apk export.

- New custom task for multi-apk export. Replaces
SetupTask for export-type projects. Calls out to the
project's build.xml after setting/overriding properties.
This also override the project's versionCode with a
new composite one made of different values.
Also uses a different build.xml, so added a new template:
build.export.template.

Very much a work in progress. Still to do:
Add other types of APK split, create/update export projects,
export the build log, ...

Also, we need to refactor the normal build rules to avoid
so much duplication!

Change-Id: I57a565c60d097a5eabb40108ae1fa8cb209f2380
nt_rules_r3.xml
nt_test_rules_r3.xml
9520e97f048059f5a0a20599d6f778786fe2acc9 29-Apr-2010 Xavier Ducrohet <xav@android.com> Ant: Add customizable targets between the default ones.

Change-Id: I5f187584afb91814ccba4e984c4c45c24557aaae
nt_rules_r3.xml
b2e132cffd83c46aa836d0b06ca2c66de87fff2e 28-Apr-2010 Xavier Ducrohet <xav@android.com> Add ABI filtering and version code injection in the Ant rules and tasks.

Change-Id: Ic8e41c1ad5343b32d2766427ba271a79c88b3b66
nt_rules_r3.xml
0fd2efc6912586032d5dbe6d5c63e242cf65a31a 28-Apr-2010 Xavier Ducrohet <xav@android.com> Add rev 3 of the ant rules.

For now they are the same as the r2.
Also modified SetupTask to deal better with older tools.

Change-Id: I22ff809ace3ff81fb6852a707165165a9b4ec88a
nt_lib_rules_r3.xml
nt_rules_r3.xml
nt_test_rules_r3.xml
dk.properties
82aecc59db32b8f35d837d9fa5719b30515a2847 09-Apr-2010 The Android Open Source Project <initial-contribution@android.com> merge from tools-r6

Change-Id: If11d893ba56c1189620e00f86b7f51bf4d698e49
5f3bb57d677abc71a3ef6fc2d8e880ede3f61ce9 03-Apr-2010 Xavier Ducrohet <xav@android.com> Fix Ant test rules.

- Fix import of the main rules since we changed the name!
- Added main project libraries to the classpath of the test project.

Bug: 2568115
Change-Id: I8803b84a179c6301736d7e2558e06a1734eef650
nt_rules_r1.xml
nt_rules_r2.xml
nt_test_rules_r2.xml
517fa95fd84a836d52a99b434670d08f2c8e0358 02-Apr-2010 Xavier Ducrohet <xav@android.com> move to Tools r7 and ADT 0.9.8

Change-Id: Ia7690ff2787aa68bb668af05bbaf13a7cf16bc8b
ools_source.properties
61942d88200c51d3856ae0d1757acf39db168e26 18-Mar-2010 Xavier Ducrohet <xav@android.com> Put back the old Ant rules and put the new ones under new names.

Change-Id: Ie6c99be890ac78ba578234be0c145147fc6afa5e
ndroid_lib_rules.xml
ndroid_rules.xml
ndroid_test_rules.xml
nt_lib_rules_r2.xml
nt_rules_r1.xml
nt_rules_r2.xml
nt_test_rules_r1.xml
nt_test_rules_r2.xml
4cb63a51c7f3c3ac12d049660af5586af94f8f5a 12-Mar-2010 Xavier Ducrohet <xav@android.com> Remove aidl step from library ant rules

aidl is not supported by libraries.

Change-Id: Id37d71ac2f1f48776bf9bff72e2a3099a1511c64
ndroid_lib_rules.xml
ed88cf93fbef99a878be3c5e6691615b34f09045 11-Mar-2010 Xavier Ducrohet <xav@android.com> Move ant.prop to sdk.prop and up a folder.

this file is meant to have general sdk properties, not
just Ant ones.

Also separated the library support from the Ant build version.
It's clearer whether or not libraries are supported, and it's
not just tied to Ant anyway (ADT needs to know as well).

Finally use that new property to do checks on library support
in both the custom Ant tasks and ADT.

Depends on a CL in development.git (sdk.atree change).

Change-Id: I77d229ed3fd60f0468b1d3d31f7cf147b03a32fb
nt.properties
dk.properties
6e2c5ced68efbaaa574c7b9d8a2063571787642e 24-Feb-2010 Xavier Ducrohet <xav@android.com> Merge remote branch 'goog/master' into HEAD
5a2bee2484c6c4c3593a1c6d9c3b9570c83d5979 24-Feb-2010 Xavier Ducrohet <xav@android.com> Only add gdbserver to the APK if the manifest has debuggable to true.

Change-Id: I2411f59f46cdda2e12b1627d450cde6c9cd109d8
ndroid_rules.xml
15f6b7be14c56571f8296c360d0f2fdfc41553c3 17-Feb-2010 Xavier Ducrohet <xav@android.com> Change the property names to something better.

Once added to the rest of the properties, "revision.*" is a bit
to vague.

Change-Id: Ifaca600ac3a5c6de35aa6bd1465a0a3fc2ccde52
nt.properties
79e103663f1eb8461f20cff0d8a82ee543027f96 17-Feb-2010 Xavier Ducrohet <xav@android.com> Change the property names to something better.

Once added to the rest of the properties, "revision.*" is a bit
to vague.

Change-Id: I386780f3bd3b39ef6ea49d1c8d3c717cb263b6a1
nt.properties
3e4e3d908df5f90d2249a5855a73160fcb65e043 17-Feb-2010 Xavier Ducrohet <xav@android.com> Merge remote branch 'goog/master' into HEAD
b91e6ca9a2f9bc09884471e7cf751b5b10667583 17-Feb-2010 Xavier Ducrohet <xav@android.com> Add Ant build/template revision to the SDK platforms.

Change-Id: I1cd3964707c5472851c6868796649e62b4f2d232
nt.properties
a359dbfeca679fe6e8637419ffdd6d7a9f6cae9a 11-Feb-2010 Xavier Ducrohet <xav@android.com> Add support for external jar files in library project.

Bug: 2294012
Change-Id: I88bc99d9c3ac4135aac4c5af7995aca25bf5c4ee
ndroid_rules.xml
7bfc74613e9bced3f1b6291280e5cc80a5f5954a 03-Feb-2010 Xavier Ducrohet <xav@android.com> Add support for library project in the Ant build system.

new build rules file for library only. Should probably extract
the parts that are common to this and the default rules file.

SetupTask now sets up some properties and Path reference based
on the libraries.
They are used by:
- aapt task (now also used for the generation of R.java) which
use all the res folders of the main project and the libraries,
and generate an R class for the project and the libraries.
- javac which compiles the src/ folders of the libraries.

Bug: 2294012
Change-Id: Ie550dcf0ba8ea57696ebb1c2a61d4c6d73307bdf
ndroid_lib_rules.xml
ndroid_rules.xml
bd2439a71d0e61493f72889613c7e3dae149304c 30-Jan-2010 Raphael Moll <raphael@google.com> am 74d66e2d: am 5f225229: Merge "SDK Updater: Support post install script for updating SDK Setup.exe." into eclair

Merge commit '74d66e2d7f810028620f25c585a3f21e5ad1686b'

* commit '74d66e2d7f810028620f25c585a3f21e5ad1686b':
SDK Updater: Support post install script for updating SDK Setup.exe.
59cd9ce8477de1cc34a9f71e4e4f0ffab2c18673 29-Jan-2010 Raphael <raphael@google.com> SDK Updater: Support post install script for updating SDK Setup.exe.

The new post_tools_install.bat will be found in SDK/tools/lib.
This also moves find_java.bat into the same lib folder.

SDK Bug: 2404830

Change-Id: I84e3671918931079f296500e296ec1a55931b851
ost_tools_install.bat
1de36b67fca4e25e70185c02efb2f76f9e33fbf9 29-Jan-2010 Raphael Moll <raphael@google.com> am 2b7a00d4: am 29e98002: Merge "SDK Launcher: capture stdout from batch file." into eclair

Merge commit '2b7a00d4dd82ab5db15249150bb36c9d09db1cb3'

* commit '2b7a00d4dd82ab5db15249150bb36c9d09db1cb3':
SDK Launcher: capture stdout from batch file.
042e9e9bc61cdc596015579a2ffdc1608ec1c958 29-Jan-2010 Xavier Ducrohet <xav@google.com> am 637f8fd1: am f7f9e459: Merge "Add support for the -0 aapt option in the custom Ant task for aapt." into eclair

Merge commit '637f8fd13bf3db1316245749b81b74f218440b38'

* commit '637f8fd13bf3db1316245749b81b74f218440b38':
Add support for the -0 aapt option in the custom Ant task for aapt.
1b55b0e1dafade9d3fe2aec76dfef21120461e2e 29-Jan-2010 Raphael Moll <raphael@google.com> am 176573bf: am 912fa771: Merge "Windows SDK: use find_java.bat in all batch wrappers." into eclair

Merge commit '176573bfeb4c68d877a9de7f17a2ab33ddfb343f'

* commit '176573bfeb4c68d877a9de7f17a2ab33ddfb343f':
Windows SDK: use find_java.bat in all batch wrappers.
29e980028f7fffbf8643ab7f6c083f721b5dba1f 28-Jan-2010 Raphael Moll <raphael@google.com> Merge "SDK Launcher: capture stdout from batch file." into eclair
ea66c92f80d9745721cfa28e22f2726b76579158 27-Jan-2010 Raphael <raphael@google.com> SDK Launcher: capture stdout from batch file.

Change-Id: Iab4e8f54bf2039cd9a17b1e814ffdc3ccd3deb23
ind_java.bat
53c03026310b6a2e2b5b15e858c8629e6bc170f0 28-Jan-2010 Xavier Ducrohet <xav@google.com> am 786767f6: am ae6a39ce: Merge "Add support for packaging gdbserver in the apk in Ant." into eclair

Merge commit '786767f6fedc1f41e4dbc622cacf2427385eb1b9'

* commit '786767f6fedc1f41e4dbc622cacf2427385eb1b9':
Add support for packaging gdbserver in the apk in Ant.
a8f7a4dca38ae0278e2c36f704950da6c097c7d6 27-Jan-2010 Xavier Ducrohet <xav@android.com> Update version numbers for Tools-r6 / ADT 0.9.7

Change-Id: I2cd2e75f97369d2d8a69e7717a49a59784c1fffd
ools_source.properties
f7f9e459f1d695d79b04dc2d385c15ec9fdaf4f2 27-Jan-2010 Xavier Ducrohet <xav@google.com> Merge "Add support for the -0 aapt option in the custom Ant task for aapt." into eclair
f52076d815c0662f9bb1df93f77726e4acdad2f4 27-Jan-2010 Xavier Ducrohet <xav@android.com> Add support for the -0 aapt option in the custom Ant task for aapt.

Bug: 2398432
Change-Id: I2df2b8638ffaf2a5da87ff2bf17efcfb5efdff70
ndroid_rules.xml
047e5f58bb9dc8b67e1b2b61ce897c23fed8a2a4 27-Jan-2010 Raphael <raphael@google.com> Windows SDK: use find_java.bat in all batch wrappers.

SDK Bug: 2315813

Change-Id: If026d09f927b3d0b5707dfd08e1367e4ba2da28b
ind_java.bat
ccea4ad79984504212b29788bec9d42e54846c2b 21-Jan-2010 Xavier Ducrohet <xav@android.com> Add support for packaging gdbserver in the apk in Ant.

This must only be done in debug so there's a new flag
to detect debug mode. Support for this is added to the
build script, the Ant task and ApkBuilder itself.

Change-Id: Iaebdc60cc3e8fa08c8cb75c885a6a0db556bfd86
ndroid_rules.xml
178b6d4a5600300dd31b9bfd9f98cd4e959c6544 03-Dec-2009 Xavier Ducrohet <xav@android.com> Add a new device to devices.xml for the Layout Editor.

BUG 2296284
evices.xml
9f68a08a1d6a740e26f02e339a67c166cc83f1db 03-Dec-2009 Xavier Ducrohet <xav@android.com> Remove files that have been moved into development.git
oc_source.properties
latform_source.properties
sbdriver_source.properties
aa970a49713734c20fdde6e50e9de6ef33308901 01-Dec-2009 Xavier Ducrohet <xav@android.com> Clean up the content of scripts/ folder.

- move back some scripts into development/scripts/
- templates for Ant project go in sdk/templates/
- files that are packaged with the sdk go in sdk/files/
EADME_add-ons.txt
lias_rules.xml
ndroid.el
ndroid_rules.xml
ndroid_test_rules.xml
evices.xml
oc_source.properties
latform_source.properties
lugin.prop
dk_files_NOTICE.txt
ools_source.properties
sbdriver_source.properties