aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--changes.txt2
-rw-r--r--files/ant/main_rules.xml9
2 files changed, 10 insertions, 1 deletions
diff --git a/changes.txt b/changes.txt
index 4fe7cd3..603c3e6 100644
--- a/changes.txt
+++ b/changes.txt
@@ -7,6 +7,8 @@ Revision 8:
the Android Manifest.
"ant debug" will automatically insert debuggable==true, while "ant release"
will not.
+- new overridable Ant javac properties: java.encoding, java.source, and java.target
+ (default to "ascii", "1.5" and "1.5")
Revision 7:
diff --git a/files/ant/main_rules.xml b/files/ant/main_rules.xml
index 96fb0ef..7059f3a 100644
--- a/files/ant/main_rules.xml
+++ b/files/ant/main_rules.xml
@@ -111,6 +111,11 @@
<property name="aapt.resource.filter" value="" />
<property name="filter.abi" value="" />
+ <!-- compilation options -->
+ <property name="java.encoding" value="ascii" />
+ <property name="java.target" value="1.5" />
+ <property name="java.source" value="1.5" />
+
<!-- Verbosity -->
<property name="verbose" value="false" />
<!-- This is needed by emma as it uses multilevel verbosity instead of simple 'true' or 'false'
@@ -323,7 +328,9 @@
else="./libs">
<isset property="tested.project.absolute.dir" />
</condition>
- <javac encoding="ascii" target="1.5" debug="true" extdirs=""
+ <javac encoding="${java.encoding}"
+ source="${java.source}" target="${java.target}"
+ debug="true" extdirs=""
destdir="${out.classes.absolute.dir}"
bootclasspathref="android.target.classpath"
verbose="${verbose}"