diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-09-24 08:11:12 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-09-24 12:33:29 -0700 |
| commit | ddfe27973764d82001d52d5ba8306af8f2e79fee (patch) | |
| tree | ab890cb261287271cf256041b5ab81a9c234b4e5 | |
| parent | 4fb194e77970aa935067c589c90a6a6e03d3e6ea (diff) | |
| download | sdk-ddfe27973764d82001d52d5ba8306af8f2e79fee.zip sdk-ddfe27973764d82001d52d5ba8306af8f2e79fee.tar.gz sdk-ddfe27973764d82001d52d5ba8306af8f2e79fee.tar.bz2 | |
Make javac ant options configurable.
Change-Id: I303acdb4fc8de6ba5d8de7c18e020e97fe01e3de
| -rw-r--r-- | changes.txt | 2 | ||||
| -rw-r--r-- | files/ant/main_rules.xml | 9 |
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}" |