diff --git a/app/build.gradle b/app/build.gradle
index 6c43d6f4..33ab6b4d 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -80,7 +80,7 @@ android {
         // Configures multiple APKs based on ABI.
         abi {
             // Enables building multiple APKs per ABI.
-            enable true
+            enable !project.hasProperty("noAbiSplits") && gradle.startParameter.taskNames.contains("Release")
 
             // By default all ABIs are included, so use reset() and include to specify that we only
             // want APKs for x86 and x86_64.