diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-12-06 10:48:57 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-12-06 10:49:45 -0800 |
| commit | a3d14e0800ba730ab2ed0f33cf25acd0fd9968db (patch) | |
| tree | 3af102703e506621927a3d4e79745cc86428b977 /files/ant | |
| parent | f26e9175f90fe7682c5a8fe0af670ee29e95f9c0 (diff) | |
| download | sdk-a3d14e0800ba730ab2ed0f33cf25acd0fd9968db.zip sdk-a3d14e0800ba730ab2ed0f33cf25acd0fd9968db.tar.gz sdk-a3d14e0800ba730ab2ed0f33cf25acd0fd9968db.tar.bz2 | |
Fix ant rules
- utf-8 is default encoding for java files.
- make encoding, target, source also overridable in the lib rules.
Change-Id: I95a6dfd2a815ea9994638c0a0270381819b75a12
Diffstat (limited to 'files/ant')
| -rw-r--r-- | files/ant/lib_rules.xml | 9 | ||||
| -rw-r--r-- | files/ant/main_rules.xml | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/files/ant/lib_rules.xml b/files/ant/lib_rules.xml index 96dc407..42a1e48 100644 --- a/files/ant/lib_rules.xml +++ b/files/ant/lib_rules.xml @@ -62,6 +62,11 @@ <property name="out.classes.dir" value="${out.absolute.dir}/classes" /> <property name="out.classes.absolute.dir" location="${out.classes.dir}" /> + <!-- compilation options --> + <property name="java.encoding" value="UTF-8" /> + <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' @@ -147,7 +152,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}" diff --git a/files/ant/main_rules.xml b/files/ant/main_rules.xml index 7be13d7..e63f941 100644 --- a/files/ant/main_rules.xml +++ b/files/ant/main_rules.xml @@ -118,7 +118,7 @@ <property name="filter.abi" value="" /> <!-- compilation options --> - <property name="java.encoding" value="ascii" /> + <property name="java.encoding" value="UTF-8" /> <property name="java.target" value="1.5" /> <property name="java.source" value="1.5" /> |