removed option for merging dex files - it makes no sense to not merge and Soot now does it always

StevenArzt · StevenArzt · commit c4b3ff0618d5 · 2026-02-16T12:42:28.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -3,14 +3,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
 	<artifactId>parent</artifactId>
-	<version>2.15.0</version>
+	<version>2.16.0-SNAPSHOT</version>
 	<name>FlowDroid Parent Module</name>
 	<description>Parent module for the FlowDroid data flow tracker</description>
 	<url>https://github.com/secure-software-engineering/FlowDroid</url>	
 	<packaging>pom</packaging>
 
 	<properties>
-		<revision>2.15.0</revision>
+		<revision>2.16.0-SNAPSHOT</revision>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
@@ -35,7 +35,7 @@
 
 		<apache-commons-cli.version>1.11.0</apache-commons-cli.version>
 
-		<soot.version>4.7.0</soot.version>
+		<soot.version>4.8.0-SNAPSHOT</soot.version>
 	</properties>
 
 	<developers>
diff --git a/soot-infoflow-android/pom.xml b/soot-infoflow-android/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.15.0</version>
+		<version>2.16.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	
diff --git a/soot-infoflow-android/schema/FlowDroidConfiguration.xsd b/soot-infoflow-android/schema/FlowDroidConfiguration.xsd
@@ -89,7 +89,6 @@
 			<xs:element name="maxCallbacksPerComponent" type="xs:int" minOccurs="0" />
 			<xs:element name="maxCallbackDepth" type="xs:int" minOccurs="0" />
 			<xs:element name="layoutMatchingMode" type="layoutMatchingModeType" minOccurs="0" />
-			<xs:element name="mergeDexFiles" type="xs:boolean" minOccurs="0" />
 			<xs:element name="callbackSourceMode" type="callbackSourceModeType" minOccurs="0" />
 			<xs:element name="callbackAnalysisTimeout" type="xs:int" minOccurs="0" />
 		</xs:all>
diff --git a/soot-infoflow-android/src/soot/jimple/infoflow/android/InfoflowAndroidConfiguration.java b/soot-infoflow-android/src/soot/jimple/infoflow/android/InfoflowAndroidConfiguration.java
@@ -723,8 +723,6 @@ public static enum CallbackAnalyzer {
 	private final IccConfiguration iccConfig = new IccConfiguration();
 	private final AnalysisFileConfiguration analysisFileConfig = new AnalysisFileConfiguration();
 
-	private boolean mergeDexFiles = true;
-
 	private boolean performConstantPropagation;
 	private static boolean createActivityEntryMethods = true;
 
@@ -749,8 +747,6 @@ public void merge(InfoflowConfiguration config) {
 			this.sourceSinkConfig.merge(androidConfig.sourceSinkConfig);
 			this.iccConfig.merge(androidConfig.iccConfig);
 			this.analysisFileConfig.merge(androidConfig.analysisFileConfig);
-
-			this.mergeDexFiles = androidConfig.mergeDexFiles;
 		}
 	}
 
@@ -813,28 +809,6 @@ public boolean getOneComponentAtATime() {
 		return this.oneComponentAtATime;
 	}
 
-	/**
-	 * Gets whether FlowDroid shall merge all dex files in the APK to get a full
-	 * picture of the app
-	 * 
-	 * @return True if FlowDroid shall merge all dex files in the APK, otherwise
-	 *         false
-	 */
-	public boolean getMergeDexFiles() {
-		return this.mergeDexFiles;
-	}
-
-	/**
-	 * Sets whether FlowDroid shall merge all dex files in the APK to get a full
-	 * picture of the app
-	 * 
-	 * @param mergeDexFiles True if FlowDroid shall merge all dex files in the APK,
-	 *                      otherwise false
-	 */
-	public void setMergeDexFiles(boolean mergeDexFiles) {
-		this.mergeDexFiles = mergeDexFiles;
-	}
-
 	/**
 	 * Gets if Flowdroid should create new Methods when creating the Activity Entry
 	 * point
@@ -863,7 +837,6 @@ public int hashCode() {
 		result = prime * result + ((analysisFileConfig == null) ? 0 : analysisFileConfig.hashCode());
 		result = prime * result + ((callbackConfig == null) ? 0 : callbackConfig.hashCode());
 		result = prime * result + ((iccConfig == null) ? 0 : iccConfig.hashCode());
-		result = prime * result + (mergeDexFiles ? 1231 : 1237);
 		result = prime * result + (oneComponentAtATime ? 1231 : 1237);
 		result = prime * result + ((sourceSinkConfig == null) ? 0 : sourceSinkConfig.hashCode());
 		return result;
@@ -893,8 +866,6 @@ public boolean equals(Object obj) {
 				return false;
 		} else if (!iccConfig.equals(other.iccConfig))
 			return false;
-		if (mergeDexFiles != other.mergeDexFiles)
-			return false;
 		if (oneComponentAtATime != other.oneComponentAtATime)
 			return false;
 		if (sourceSinkConfig == null) {
diff --git a/soot-infoflow-android/src/soot/jimple/infoflow/android/SetupApplication.java b/soot-infoflow-android/src/soot/jimple/infoflow/android/SetupApplication.java
@@ -1257,7 +1257,6 @@ private void initializeSoot() {
 		Options.v().set_keep_offset(false);
 		Options.v().set_keep_line_number(config.getEnableLineNumbers());
 		Options.v().set_throw_analysis(Options.throw_analysis_dalvik);
-		Options.v().set_process_multiple_dex(config.getMergeDexFiles());
 		Options.v().set_ignore_resolution_errors(true);
 
 		// Set soot phase option if original names should be used
diff --git a/soot-infoflow-android/src/soot/jimple/infoflow/android/config/XMLConfigurationParser.java b/soot-infoflow-android/src/soot/jimple/infoflow/android/config/XMLConfigurationParser.java
@@ -173,8 +173,6 @@ else if (currentElement.equals(XMLConstants.TAG_MAX_CALLBACK_DEPTH))
 						callbackConfig.setMaxAnalysisCallbackDepth(Integer.valueOf(data));
 					else if (currentElement.equals(XMLConstants.TAG_LAYOUT_MATCHING_MODE))
 						sourceSinkConfig.setLayoutMatchingMode(LayoutMatchingMode.valueOf(data));
-					else if (currentElement.equals(XMLConstants.TAG_MERGE_DEX_FILES))
-						config.setMergeDexFiles(Boolean.valueOf(data));
 					else if (currentElement.equals(XMLConstants.TAG_CALLBACK_SOURCE_MODE))
 						sourceSinkConfig.setCallbackSourceMode(CallbackSourceMode.valueOf(data));
 					else if (currentElement.equals(XMLConstants.TAG_CALLBACK_ANALYSIS_TIMEOUT))
diff --git a/soot-infoflow-android/src/soot/jimple/infoflow/android/config/XMLConfigurationWriter.java b/soot-infoflow-android/src/soot/jimple/infoflow/android/config/XMLConfigurationWriter.java
@@ -184,8 +184,6 @@ private void writeAndroidConfig(Document document, Element parentElement) {
 				Integer.toString(callbackConfig.getMaxAnalysisCallbackDepth()));
 		appendSimpleTag(document, androidConfigTag, XMLConstants.TAG_LAYOUT_MATCHING_MODE,
 				sourceSinkConfig.getLayoutMatchingMode().toString());
-		appendSimpleTag(document, androidConfigTag, XMLConstants.TAG_MERGE_DEX_FILES,
-				Boolean.toString(config.getMergeDexFiles()));
 		appendSimpleTag(document, androidConfigTag, XMLConstants.TAG_CALLBACK_SOURCE_MODE,
 				sourceSinkConfig.getCallbackSourceMode().toString());
 		appendSimpleTag(document, androidConfigTag, XMLConstants.TAG_CALLBACK_ANALYSIS_TIMEOUT,
diff --git a/soot-infoflow-android/src/soot/jimple/infoflow/android/config/XMLConstants.java b/soot-infoflow-android/src/soot/jimple/infoflow/android/config/XMLConstants.java
@@ -29,7 +29,6 @@ class XMLConstants {
 	public static final String TAG_MAX_CALLBACKS_PER_COMPONENT = "maxCallbacksPerComponent";
 	public static final String TAG_MAX_CALLBACK_DEPTH = "maxCallbackDepth";
 
-	public static final String TAG_MERGE_DEX_FILES = "mergeDexFiles";
 	public static final String TAG_CALLBACK_SOURCE_MODE = "callbackSourceMode";
 	public static final String TAG_CALLBACK_ANALYSIS_TIMEOUT = "callbackAnalysisTimeout";
 
@@ -65,5 +64,5 @@ class XMLConstants {
 	public static final String ATTR_ID = "id";
 	public static final String ATTR_MODE = "mode";
 
-    public static final String TAG_PATH_RECONSTRUCTION_TOTAL_TIME = "pathReconstructionTotalTime";
+	public static final String TAG_PATH_RECONSTRUCTION_TOTAL_TIME = "pathReconstructionTotalTime";
 }
diff --git a/soot-infoflow-cmd/pom.xml b/soot-infoflow-cmd/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.15.0</version>
+		<version>2.16.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/soot-infoflow-cmd/src/soot/jimple/infoflow/cmd/MainClass.java b/soot-infoflow-cmd/src/soot/jimple/infoflow/cmd/MainClass.java
@@ -98,7 +98,6 @@ public class MainClass {
 	private static final String OPTION_ONE_COMPONENT = "ot";
 	private static final String OPTION_SEQUENTIAL_PATHS = "sp";
 	private static final String OPTION_LOG_SOURCES_SINKS = "ls";
-	private static final String OPTION_MERGE_DEX_FILES = "d";
 	private static final String OPTION_SINGLE_JOIN_POINT = "sa";
 	private static final String OPTION_MAX_CALLBACKS_COMPONENT = "mc";
 	private static final String OPTION_MAX_CALLBACKS_DEPTH = "md";
@@ -204,8 +203,6 @@ private void initializeCommandLineOptions() {
 				"Eliminate Android components that have more than the given number of callbacks");
 		options.addOption(OPTION_MAX_CALLBACKS_DEPTH, "maxcallbacksdepth", true,
 				"Only analyze callback chains up to the given depth");
-		options.addOption(OPTION_MERGE_DEX_FILES, "mergedexfiles", false,
-				"Merge all dex files in the given APK file into one analysis target");
 		options.addOption(OPTION_PATH_SPECIFIC_RESULTS, "pathspecificresults", false,
 				"Report different results for same source/sink pairs if they differ in their propagation paths");
 
@@ -779,8 +776,6 @@ private void parseCommandLineOptions(CommandLine cmd, InfoflowAndroidConfigurati
 			config.getPathConfiguration().setSequentialPathProcessing(true);
 		if (cmd.hasOption(OPTION_LOG_SOURCES_SINKS))
 			config.setLogSourcesAndSinks(true);
-		if (cmd.hasOption(OPTION_MERGE_DEX_FILES))
-			config.setMergeDexFiles(true);
 		if (cmd.hasOption(OPTION_PATH_SPECIFIC_RESULTS))
 			config.setPathAgnosticResults(false);
 		if (cmd.hasOption(OPTION_SINGLE_JOIN_POINT))
diff --git a/soot-infoflow-integration/pom.xml b/soot-infoflow-integration/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
         <artifactId>parent</artifactId>
-        <version>2.15.0</version>
+        <version>2.16.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>soot-infoflow-integration</artifactId>
diff --git a/soot-infoflow-integration/test/soot/jimple/infoflow/collections/test/junit/FlowDroidTests.java b/soot-infoflow-integration/test/soot/jimple/infoflow/collections/test/junit/FlowDroidTests.java
@@ -167,7 +167,6 @@ protected SetupApplication initApplication(File apkFile) {
 
 		SetupApplication setupApplication = new SetupApplication(new File(androidJars), apkFile);
 		setupApplication.getConfig().setPerformConstantPropagation(true);
-		setupApplication.getConfig().setMergeDexFiles(true);
 		setupApplication.setTaintWrapper(getTaintWrapper());
 		setConfiguration(setupApplication.getConfig());
 
diff --git a/soot-infoflow-integration/test/soot/jimple/infoflow/integration/test/junit/river/BaseJUnitTests.java b/soot-infoflow-integration/test/soot/jimple/infoflow/integration/test/junit/river/BaseJUnitTests.java
@@ -100,7 +100,6 @@ protected SetupApplication initApplication(File apkFile) {
 
 		SetupApplication setupApplication = new SetupApplication(new File(androidJars), apkFile);
 
-		setupApplication.getConfig().setMergeDexFiles(true);
 		setupApplication.setTaintWrapper(getTaintWrapper());
 		setConfiguration(setupApplication.getConfig());
 
diff --git a/soot-infoflow-summaries/pom.xml b/soot-infoflow-summaries/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.15.0</version>
+		<version>2.16.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/DefaultSummaryConfig.java b/soot-infoflow-summaries/src/soot/jimple/infoflow/methodSummary/DefaultSummaryConfig.java
@@ -49,7 +49,6 @@ public void setSootOptions(Options options, InfoflowConfiguration config) {
 		options.set_ignore_classpath_errors(true);
 
 		// We can also create summaries for classes from APK files
-		options.set_process_multiple_dex(true);
 		if (summaryConfig.getAndroidPlatformDir() != null)
 			options.set_android_jars(summaryConfig.getAndroidPlatformDir());
 	}
diff --git a/soot-infoflow/pom.xml b/soot-infoflow/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
 		<artifactId>parent</artifactId>
-		<version>2.15.0</version>
+		<version>2.16.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -157,6 +157,12 @@
 		    <version>7.0.2</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+		    <groupId>io.agentscope</groupId>
+		    <artifactId>agentscope</artifactId>
+		    <version>1.0.9</version>
+		    <scope>compile</scope>
+		</dependency>
 	</dependencies>
 
 	
