From ac533bc44d15a0f3ff1a3c59c3df709d0ef1e4a3 Mon Sep 17 00:00:00 2001
From: Julian Dolby <dolby@us.ibm.com>
Date: Wed, 4 Mar 2015 20:02:49 -0500
Subject: [PATCH] class loader stuff

---
 com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF                | 2 +-
 .../com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
index 25bc74d90..e3c197eec 100644
--- a/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.dalvik.test/META-INF/MANIFEST.MF
@@ -15,4 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .,
- lib/dx-1.7.jar
+ lib/dx.jar
diff --git a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java
index e1d25ed40..28d507a4e 100644
--- a/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java
+++ b/com.ibm.wala.dalvik.test/source/com/ibm/wala/dalvik/test/callGraph/DroidBenchCGTest.java
@@ -124,10 +124,7 @@ public abstract class DroidBenchCGTest extends DalvikCallGraphTestBase {
 	public static Collection<Object[]> generateData(final String filter) {
 	  String f = walaProperties.getProperty("droidbench.root");
 	  if (f == null || !new File(f).exists()) {
-	    f = System.getProperty("user.dir") + "/../../DroidBench";
-	    if (! new File(f + "/apk/").exists()) {
-	      f = "/tmp/DroidBench";      
-	    }
+	      f = "/tmp/DroidBench";       
 	  }
 	  
 	  System.err.println("Use " + f + " as droid bench root");