No bug - Don't let Gradle incrementally dex. r=me

DONTBUILD NPOTB

Unfortunately, Gradle just can't handle incremental dexing in our
multi-project and parallel configuration.  I see the dreaded
"com.android.dex.DexException: Multiple dex files define ..." error
frequently.

I'm using a downloaded Robotium package instead of the in-tree JAR
file as well, 'cuz it seems to be related.

--HG--
extra : rebase_source : d95c0844082a6deb48966496cb90824f70f6c49d
extra : histedit_source : 2f3d231d9b7139880a924089ab0d523e5e31e6b6

mobile/android/gradle/app/build.gradle

@@ -14,11 +14,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    dexOptions {
-        incremental true
-        preDexLibraries true
-    }
-
     lintOptions {
         abortOnError false
     }
@@ -50,7 +45,8 @@ android {
 dependencies {
     compile project(':base')
     compile project(':omnijar')
-    androidTestCompile fileTree(dir: 'libs', include: ['*.jar'])
+    // Including the Robotium JAR directly can cause issues with dexing.
+    androidTestCompile 'com.jayway.android.robotium:robotium-solo:4.3.1'
 }
 
 /**

mobile/android/gradle/base/build.gradle

@@ -14,10 +14,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    dexOptions {
-        incremental true
-    }
-
     lintOptions {
         abortOnError false
     }
@@ -51,7 +47,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:support-v4:21.+'
 
     if (mozconfig.substs.MOZ_NATIVE_DEVICES) {

mobile/android/gradle/branding/build.gradle

@@ -14,10 +14,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    dexOptions {
-        incremental true
-    }
-
     lintOptions {
         abortOnError false
     }

mobile/android/gradle/build.gradle

@@ -5,6 +5,10 @@ allprojects {
         topsrcdir = gradle.mozconfig.topsrcdir
         topobjdir = gradle.mozconfig.topobjdir
     }
+
+    repositories {
+        jcenter()
+    }
 }
 
 buildDir "${topobjdir}/mobile/android/gradle/build"
@@ -22,10 +26,6 @@ buildscript {
     }
 }
 
-repositories {
-    jcenter()
-}
-
 task generateCodeAndResources(type:Exec) {
     workingDir "${topobjdir}"
 

mobile/android/gradle/preprocessed_code/build.gradle

@@ -14,10 +14,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    dexOptions {
-        incremental true
-    }
-
     lintOptions {
         abortOnError false
     }

mobile/android/gradle/preprocessed_resources/build.gradle

@@ -14,10 +14,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    dexOptions {
-        incremental true
-    }
-
     lintOptions {
         abortOnError false
     }

mobile/android/gradle/thirdparty/build.gradle

@@ -14,10 +14,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    dexOptions {
-        incremental true
-    }
-
     lintOptions {
         abortOnError false
     }
@@ -33,6 +29,5 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:support-v4:21.+'
 }

mobile/android/gradle/thirdparty_adjust_sdk/build.gradle

@@ -14,10 +14,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
-    dexOptions {
-        incremental true
-    }
-
     lintOptions {
         abortOnError false
     }
@@ -32,6 +28,5 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:support-v4:21.+'
 }