From e9fddda9eac133603d011265379fdceecebb4168 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 23 Nov 2011 15:08:24 -0800 Subject: 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 --- files/ant/build.xml | 16 +++++++++++++--- templates/build.template | 4 ++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/files/ant/build.xml b/files/ant/build.xml index 14192d8..7891176 100644 --- a/files/ant/build.xml +++ b/files/ant/build.xml @@ -1,5 +1,5 @@ - + @@ -376,8 +377,13 @@ to clean the main project as well as the libraries and tested project --> + + + - + @@ -654,6 +660,7 @@ + @@ -863,7 +870,7 @@ - @@ -875,6 +882,7 @@ + @@ -964,6 +972,7 @@ + @@ -1039,6 +1048,7 @@ + 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 @@ - + -- cgit v1.1