Bug 938994 - Post: Update Gradle configurations. r?sebastian draft
authorNick Alexander <nalexander@mozilla.com>
Mon, 09 Nov 2015 10:18:45 -0800
changeset 307655 4ed20ca285932773e617e1f477119d598118d6bc
parent 307654 41e0904079abd0c82a03f01e5b6acf2b4b2d0333
child 511028 6b20642aa7c309928f2b8ebcc762229fe0e9521e
push id7333
push usernalexander@mozilla.com
push dateMon, 09 Nov 2015 18:31:16 +0000
reviewerssebastian
bugs938994
milestone45.0a1
Bug 938994 - Post: Update Gradle configurations. r?sebastian I moved the JAR out of the root directory because I didn't want multiple copies of things in robocop/ appearing in IntelliJ, although this turns out to not be strictly necessary. Keeping it as part of a general push to move things out of the root dumping ground.
mobile/android/app/build.gradle
mobile/android/mach_commands.py
mobile/android/tests/browser/robocop/Makefile.in
mobile/android/tests/browser/robocop/libs/robotium-solo-4.3.1.jar
mobile/android/tests/browser/robocop/robotium-solo-4.3.1.jar
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -31,25 +31,25 @@ android {
     }
 
     sourceSets {
         main {
             manifest.srcFile "${topobjdir}/mobile/android/base/AndroidManifest.xml"
         }
 
         androidTest {
-            manifest.srcFile "${topobjdir}/build/mobile/robocop/AndroidManifest.xml"
+            manifest.srcFile "${topobjdir}/mobile/android/tests/browser/robocop/AndroidManifest.xml"
             java {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/src"
                 srcDir "${topsrcdir}/mobile/android/tests/background/junit3/src"
                 srcDir "${topsrcdir}/mobile/android/tests/browser/junit3/src"
                 srcDir "${topsrcdir}/mobile/android/tests/javaddons/src"
             }
             res {
-                srcDir "${topsrcdir}/build/mobile/robocop/res"
+                srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/res"
             }
             assets {
                 srcDir "${topsrcdir}/mobile/android/tests/browser/robocop/assets"
             }
         }
     }
 }
 
--- a/mobile/android/mach_commands.py
+++ b/mobile/android/mach_commands.py
@@ -107,25 +107,23 @@ class MachCommands(MachCommandBase):
         srcdir('omnijar/build.gradle', 'mobile/android/gradle/omnijar/build.gradle')
         srcdir('omnijar/src/main/java/locales', 'mobile/android/locales')
         srcdir('omnijar/src/main/java/chrome', 'mobile/android/chrome')
         srcdir('omnijar/src/main/java/components', 'mobile/android/components')
         srcdir('omnijar/src/main/java/modules', 'mobile/android/modules')
         srcdir('omnijar/src/main/java/themes', 'mobile/android/themes')
 
         srcdir('app/build.gradle', 'mobile/android/gradle/app/build.gradle')
-        srcdir('app/src/androidTest/res', 'build/mobile/robocop/res')
+        srcdir('app/src/androidTest/res', 'mobile/android/tests/browser/robocop/res')
         srcdir('app/src/androidTest/assets', 'mobile/android/tests/browser/robocop/assets')
         # Test code.
         srcdir('app/src/robocop', 'mobile/android/tests/browser/robocop/src')
         srcdir('app/src/background', 'mobile/android/tests/background/junit3/src')
         srcdir('app/src/browser', 'mobile/android/tests/browser/junit3/src')
         srcdir('app/src/javaaddons', 'mobile/android/tests/javaaddons/src')
-        # Test libraries.
-        srcdir('app/libs', 'build/mobile/robocop')
 
         srcdir('base/build.gradle', 'mobile/android/gradle/base/build.gradle')
         srcdir('base/lint.xml', 'mobile/android/gradle/base/lint.xml')
         srcdir('base/src/main/AndroidManifest.xml', 'mobile/android/gradle/base/AndroidManifest.xml')
         srcdir('base/src/main/java/org/mozilla/gecko', 'mobile/android/base')
         srcdir('base/src/main/java/org/mozilla/mozstumbler', 'mobile/android/stumbler/java/org/mozilla/mozstumbler')
         srcdir('base/src/main/java/org/mozilla/search', 'mobile/android/search/java/org/mozilla/search')
         srcdir('base/src/main/java/org/mozilla/javaaddons', 'mobile/android/javaaddons/java/org/mozilla/javaaddons')
--- a/mobile/android/tests/browser/robocop/Makefile.in
+++ b/mobile/android/tests/browser/robocop/Makefile.in
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TESTPATH := $(srcdir)/src/org/mozilla/gecko/tests
 
 ANDROID_EXTRA_JARS += \
-  $(srcdir)/robotium-solo-4.3.1.jar \
+  $(srcdir)/libs/robotium-solo-4.3.1.jar \
   $(NULL)
 
 _JAVA_HARNESS := \
   Actions.java \
   Assert.java \
   Driver.java \
   Element.java \
   FennecInstrumentationTestRunner.java \
rename from mobile/android/tests/browser/robocop/robotium-solo-4.3.1.jar
rename to mobile/android/tests/browser/robocop/libs/robotium-solo-4.3.1.jar