diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-12-06 11:58:32 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-12-06 11:58:32 -0800 |
| commit | 3225819eb75711cfe46ef99f1a4f1508fcc088ac (patch) | |
| tree | dc00a97bd954f6963e1a5a96f229f5467147264e /files | |
| parent | 193e93d2badf04b1d9e865c4c74619ba32196d9f (diff) | |
| parent | 90b6045294b33e87e972a49f587f1e2e78686c9a (diff) | |
| download | sdk-3225819eb75711cfe46ef99f1a4f1508fcc088ac.zip sdk-3225819eb75711cfe46ef99f1a4f1508fcc088ac.tar.gz sdk-3225819eb75711cfe46ef99f1a4f1508fcc088ac.tar.bz2 | |
merge from open-source master
Change-Id: I5a05ec6c6dca06af72779d6c4d66efcaba8abd10
Diffstat (limited to 'files')
| -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" /> |