diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-11-23 15:08:24 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-11-23 15:08:24 -0800 |
| commit | e9fddda9eac133603d011265379fdceecebb4168 (patch) | |
| tree | 75e5840cb75c5c72389eeaca547a0640d7710061 /templates | |
| parent | f3d29f8450d1546f7d8ab2d67d6d83be6232fbd8 (diff) | |
| download | replicant_sdk-e9fddda9eac133603d011265379fdceecebb4168.zip replicant_sdk-e9fddda9eac133603d011265379fdceecebb4168.tar.gz replicant_sdk-e9fddda9eac133603d011265379fdceecebb4168.tar.bz2 | |
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
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/build.template | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/build.template b/templates/build.template index 1ea1be9..df28fa2 100644 --- a/templates/build.template +++ b/templates/build.template @@ -4,7 +4,7 @@ <!-- The local.properties file is created and updated by the 'android' tool. It contains the path to the SDK. It should *NOT* be checked into Version Control Systems. --> - <loadproperties srcFile="local.properties" /> + <property file="local.properties" /> <!-- The ant.properties file can be created by you. It is only edited by the 'android' tool to add properties to it. @@ -41,7 +41,7 @@ <!-- quick check on sdk.dir --> <fail - message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'" + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var" unless="sdk.dir" /> |