Merge pull request #148 from liblit/automatic-dx-jar-download

Automatically download “dx.jar” when building

.gitignore

@@ -41,4 +41,4 @@ target/
 com.ibm.wala.dalvik.test/data/sample.cup
 com.ibm.wala.dalvik.test/parser.java
 com.ibm.wala.dalvik.test/report
-com.ibm.wala.dalvik.test/sym.java
+com.ibm.wala.dalvik.test/sym.java

.travis.yml

@@ -3,11 +3,7 @@ jdk: oraclejdk8
 before_install:
  - "export DISPLAY=:99.0"
  - "sh -e /etc/init.d/xvfb start"
- - "pushd /tmp"
- - "git clone --depth=1 https://github.com/secure-software-engineering/DroidBench.git"
- - "popd"
- - "mkdir -p $TRAVIS_BUILD_DIR/com.ibm.wala.dalvik.test/lib"
- - "find /usr/local -name dx.jar -exec cp '{}' $TRAVIS_BUILD_DIR/com.ibm.wala.dalvik.test/lib/dx.jar ';'"
+ - "git clone --depth=1 https://github.com/secure-software-engineering/DroidBench.git /tmp/DroidBench"
 install:
  - mvn clean verify -DskipTests=true -B -q
 script:
@@ -19,4 +15,3 @@ cache:
   directories:
     - $HOME/.m2
     - $TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib
-    

com.ibm.wala.dalvik.test/build.xml

@@ -62,21 +62,16 @@
      <available file="${plugin.destination}/data/android.jar" property="android.jar.present"/>
    </target>
 
-   <target name="copyDxJar" depends="dxJarPresent" unless="dx.jar.present">
-	<fail unless="env.ANDROID_HOME" message="ANDROID_HOME is not set! Set the environment variable or copy dx.jar manually." />
-	<mkdir dir="${basedir}/lib/"/>
-	<copy tofile="${basedir}/lib/dx.jar">
-		<first>
-			<fileset dir="${env.ANDROID_HOME}" includes="build-tools/*/lib/dx.jar"/>
-		</first>
-	</copy>
-   </target>
+	<target name="fetchDxJar" depends="dxJarPresent" unless="dx.jar.present">
+		<mkdir dir="${basedir}/lib/"/>
+		<get src="http://central.maven.org/maven2/com/google/android/tools/dx/1.7/dx-1.7.jar" dest="${basedir}/lib/dx.jar" />
+	</target>
 
    <target name="dxJarPresent" depends="init">
 	<available file="${basedir}/lib/dx.jar" property="dx.jar.present"/>
    </target>
 
-   <target name="getJars" depends="fetchSampleLex,fetchSampleCup,fetchAndroidJar,copyDxJar" />
+	<target name="getJars" depends="fetchSampleLex,fetchSampleCup,fetchAndroidJar,fetchDxJar" />
 
 	<target name="init" depends="properties">
 		<condition property="pluginTemp" value="${buildTempFolder}/plugins">