diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-14 15:52:12 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-08-17 16:09:14 -0700 |
| commit | babf25ca7162849f0145f75be1b6c09b359b122c (patch) | |
| tree | c03538b2c6bc29e507b42d35cfe4642a804fed93 /files/ant/pre_setup.xml | |
| parent | 168e27a3d37e983726a82e66950f03926e7ea52f (diff) | |
| download | sdk-babf25ca7162849f0145f75be1b6c09b359b122c.zip sdk-babf25ca7162849f0145f75be1b6c09b359b122c.tar.gz sdk-babf25ca7162849f0145f75be1b6c09b359b122c.tar.bz2 | |
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
Diffstat (limited to 'files/ant/pre_setup.xml')
| -rw-r--r-- | files/ant/pre_setup.xml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/files/ant/pre_setup.xml b/files/ant/pre_setup.xml index eee449a..1c86109 100644 --- a/files/ant/pre_setup.xml +++ b/files/ant/pre_setup.xml @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="imported" basedir="."> - <!-- Custom Android task to deal with the project target, and import the - proper rules. - This requires ant 1.6.0 or above. --> - <path id="android.antlibs"> - <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" /> - </path> + <fail message="Your build.xml file is outdated. Delete it and regenerate it with 'android update project'"/> - <taskdef name="setup" - classname="com.android.ant.SetupTask" - classpathref="android.antlibs" /> </project> |