diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-08-12 17:50:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-12 17:50:31 +0000 |
| commit | 99196f80d7a8ea1b4f7a710746c43121b81baada (patch) | |
| tree | 2b890c58ac3ebcc12bfcc6f0ec12d0bc4ec65a5f | |
| parent | 6da9a761cd06c67a9c30534b4da2b8447aced5d0 (diff) | |
| parent | 4609c3cb22b75923dbb3cb67ea49d3666a2fe8f5 (diff) | |
| download | sdk-99196f80d7a8ea1b4f7a710746c43121b81baada.zip sdk-99196f80d7a8ea1b4f7a710746c43121b81baada.tar.gz sdk-99196f80d7a8ea1b4f7a710746c43121b81baada.tar.bz2 | |
Merge "Some changes added to compile and run with Java 6 and Java 7."
| -rw-r--r-- | testapps/basicJar/build.xml | 4 | ||||
| -rw-r--r-- | testapps/basicJar2/build.xml | 4 | ||||
| -rw-r--r-- | testapps/basicJar3/build.xml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/testapps/basicJar/build.xml b/testapps/basicJar/build.xml index d7f73e9..ebe77ff 100644 --- a/testapps/basicJar/build.xml +++ b/testapps/basicJar/build.xml @@ -3,7 +3,7 @@ <target name="compile"> <mkdir dir="${basedir}/bin" /> <mkdir dir="${basedir}/bin/classes" /> - <javac encoding="ascii" target="1.5" debug="true" extdirs="" + <javac encoding="ascii" target="1.5" source="1.5" debug="true" extdirs="" srcdir="src" destdir="${basedir}/bin/classes" /> <jar destfile="${basedir}/bin/${ant.project.name}.jar"> <fileset dir="${basedir}/bin/classes" /> @@ -13,4 +13,4 @@ <target name="clean"> <delete dir="bin" /> </target> -</project>
\ No newline at end of file +</project> diff --git a/testapps/basicJar2/build.xml b/testapps/basicJar2/build.xml index 1c02cfd..a5b0657 100644 --- a/testapps/basicJar2/build.xml +++ b/testapps/basicJar2/build.xml @@ -3,7 +3,7 @@ <target name="compile"> <mkdir dir="${basedir}/bin" /> <mkdir dir="${basedir}/bin/classes" /> - <javac encoding="ascii" target="1.5" debug="true" extdirs="" + <javac encoding="ascii" target="1.5" source="1.5" debug="true" extdirs="" srcdir="src" destdir="${basedir}/bin/classes" /> <jar destfile="${basedir}/bin/${ant.project.name}.jar"> <fileset dir="${basedir}/bin/classes" /> @@ -13,4 +13,4 @@ <target name="clean"> <delete dir="bin" /> </target> -</project>
\ No newline at end of file +</project> diff --git a/testapps/basicJar3/build.xml b/testapps/basicJar3/build.xml index 41f7ee8..208501f 100644 --- a/testapps/basicJar3/build.xml +++ b/testapps/basicJar3/build.xml @@ -3,7 +3,7 @@ <target name="compile"> <mkdir dir="${basedir}/bin" /> <mkdir dir="${basedir}/bin/classes" /> - <javac encoding="ascii" target="1.5" debug="true" extdirs="" + <javac encoding="ascii" target="1.5" source="1.5" debug="true" extdirs="" srcdir="src" destdir="${basedir}/bin/classes" /> <jar destfile="${basedir}/bin/${ant.project.name}.jar"> <fileset dir="${basedir}/bin/classes" /> @@ -13,4 +13,4 @@ <target name="clean"> <delete dir="bin" /> </target> -</project>
\ No newline at end of file +</project> |