aboutsummaryrefslogtreecommitdiffstats
path: root/testapps/basicJar
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-03-07 15:20:12 -0800
committerXavier Ducrohet <xav@android.com>2012-03-07 15:46:38 -0800
commit8a3082c6750064eaab3e0a63816f136bb061b6c6 (patch)
tree6234eece3b136b3d7874bec97e160617ec742dc1 /testapps/basicJar
parentbcf44e9429811b3e1f97d21ea92816957bce2601 (diff)
downloadsdk-8a3082c6750064eaab3e0a63816f136bb061b6c6.zip
sdk-8a3082c6750064eaab3e0a63816f136bb061b6c6.tar.gz
sdk-8a3082c6750064eaab3e0a63816f136bb061b6c6.tar.bz2
More changes to the test projects.
Change-Id: I823bcc19b7de6cea4c985f2c01feccddd6f8022d
Diffstat (limited to 'testapps/basicJar')
-rw-r--r--testapps/basicJar/build.xml8
-rw-r--r--testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java3
2 files changed, 10 insertions, 1 deletions
diff --git a/testapps/basicJar/build.xml b/testapps/basicJar/build.xml
index 178e6b0..d7f73e9 100644
--- a/testapps/basicJar/build.xml
+++ b/testapps/basicJar/build.xml
@@ -5,6 +5,12 @@
<mkdir dir="${basedir}/bin/classes" />
<javac encoding="ascii" target="1.5" debug="true" extdirs=""
srcdir="src" destdir="${basedir}/bin/classes" />
- <jar basedir="${basedir}/bin/classes" destfile="${basedir}/bin/${ant.project.name}.jar" />
+ <jar destfile="${basedir}/bin/${ant.project.name}.jar">
+ <fileset dir="${basedir}/bin/classes" />
+ <fileset dir="src" excludes="**/*.java"/>
+ </jar>
+ </target>
+ <target name="clean">
+ <delete dir="bin" />
</target>
</project> \ No newline at end of file
diff --git a/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java b/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java
index 3347951..fa8efa3 100644
--- a/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java
+++ b/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java
@@ -9,6 +9,9 @@ public class BasicJar {
public static String getContent() {
InputStream input = BasicJar.class.getResourceAsStream("basicJar.txt");
+ if (input == null) {
+ return "FAILED TO FIND basicJar.txt";
+ }
BufferedReader reader = null;
try {