diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-02-08 13:50:01 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-02-08 13:53:28 -0800 |
| commit | 96f99e924b2e0d1de50418036f2bfc369b89d688 (patch) | |
| tree | 26d40ced3b1119b669c62b0df883462539f5eb8a /templates | |
| parent | 3affb7747350f449529260744f37e0274f8fac50 (diff) | |
| download | sdk-96f99e924b2e0d1de50418036f2bfc369b89d688.zip sdk-96f99e924b2e0d1de50418036f2bfc369b89d688.tar.gz sdk-96f99e924b2e0d1de50418036f2bfc369b89d688.tar.bz2 | |
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
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/build.template | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/templates/build.template b/templates/build.template index f57adf9..d975bdc 100644 --- a/templates/build.template +++ b/templates/build.template @@ -32,18 +32,10 @@ application and should be checked into Version Control Systems. --> <property file="default.properties" /> - <!-- 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" /> - <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" /> - <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" /> - </path> - - <taskdef name="setup" - classname="com.android.ant.SetupTask" - classpathref="android.antlibs" /> + + <!-- Required pre-setup import --> + <import file="${sdk.dir}/tools/ant/pre_setup.xml" /> + <!-- extension targets. Uncomment the ones where you want to do custom work in between standard targets --> @@ -60,12 +52,15 @@ </target> --> - <!-- Execute the Android Setup task that will setup some properties specific to the target, and import the build rules files. The rules file is imported from - <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml + <SDK>/tools/ant/ + Depending on the project type it can be either: + - main_rules.xml + - lib_rules.xml + - test_rules.xml To customize existing targets, there are two options: - Customize only one target: |