diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-09-24 14:37:03 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-09-24 14:37:03 -0700 |
| commit | 4a0478d54b93ee057644e0d700bcc995ce15689c (patch) | |
| tree | 989c6fa875cd278aea8ab31c1c20a3e8b80a6ea1 /files | |
| parent | 9b3e1ca284b46d52bf1cfb3dcf91e05dfc3176a0 (diff) | |
| parent | 9ed278bf018126ba68ed708416ef3b95d9a8b0a6 (diff) | |
| download | sdk-4a0478d54b93ee057644e0d700bcc995ce15689c.zip sdk-4a0478d54b93ee057644e0d700bcc995ce15689c.tar.gz sdk-4a0478d54b93ee057644e0d700bcc995ce15689c.tar.bz2 | |
merge from open-source master
Change-Id: If12bf352bc918d9f874e619bb5b3053c755c9699
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/main_rules.xml | 9 |
1 files changed, 8 insertions, 1 deletions
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}" |