diff --git a/build.gradle b/build.gradle
index 9a2a06d27..b6166250b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,6 +79,14 @@ allprojects {
 			':smack-android',
 			':smack-android-extensions',
 		].collect{ project(it) }
+		androidOptionalProjects = [
+			':smack-tcp',
+			':smack-extensions',
+			':smack-experimental',
+			':smack-bosh',
+			':smack-omemo',
+			':smack-omemo-signal',
+		].collect{ project(it) }
 		gplLicensedProjects = [
 			':smack-omemo-signal',
 			':smack-omemo-signal-integration-test',
diff --git a/smack-android/build.gradle b/smack-android/build.gradle
index c5c9a920d..caeaae305 100644
--- a/smack-android/build.gradle
+++ b/smack-android/build.gradle
@@ -9,9 +9,8 @@ smack-extensions and smack-experimental."""
 dependencies {
 	// androidProjects lists all projects that are checked to compile against android.jar
 	// Filter out the optional Smack dependencies from androidProjects
-	androidProjects.findAll {
-		![':smack-tcp', ':smack-extensions', ':smack-experimental', ':smack-bosh'].contains(it.getPath())
-	}.each { project ->
+	(androidProjects - androidOptionalProjects)
+	.each { project ->
 		compile project
 	}