Bug 1258760 - Include Robocop support files when building --with-gradle. r=gps

The initial --with-gradle support disabled building the Android test
directories; everything was built from
mobile/android/app/build.gradle.  That doesn't declare support files
that need to be packaged for Robocop tests.  This patch stops building
instrumentation test APKs, which aren't used in automation under any
circumstance and which aren't packaged when building with Gradle; and
avoids building the Robocop APK by tweaking the Makefile.  That gets
support files in place while not using moz.build in place of Gradle.

I would have declared the support files elsewhere, but there are path
requirements that I couldn't make work, so in robocop/ they stay.

MozReview-Commit-ID: KCpXvqzYBsY

--HG--
extra : rebase_source : b99be8fada7787ee473f68265824cca2250c70a1
extra : histedit_source : fa19d3ede51e14707f400ab8527d44f5bf550f85

mobile/android/moz.build

@@ -29,9 +29,8 @@ DIRS += [
 if CONFIG['MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER']:
     DIRS += ['bouncer'] # No ordering implied with respect to base.
 
-if not CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
-    TEST_DIRS += [
-        'tests',
-    ]
+TEST_DIRS += [
+    'tests',
+]
 
 SPHINX_TREES['fennec'] = 'docs'

mobile/android/tests/browser/moz.build

@@ -6,8 +6,12 @@
 
 MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini']
 
+if not CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
+    TEST_DIRS += [
+        'junit3',
+    ]
+
 TEST_DIRS += [
-    'junit3',
     'robocop/roboextender',
     'robocop',
 ]

mobile/android/tests/browser/robocop/Makefile.in

@@ -54,7 +54,9 @@ JAVAFILES += \
 
 include $(topsrcdir)/config/rules.mk
 
+ifndef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
 tools:: $(ANDROID_APK_NAME).apk
+endif
 
 # The test APK needs to know the contents of the target APK while not
 # being linked against them.  This is a best effort to avoid getting

mobile/android/tests/moz.build

@@ -4,8 +4,12 @@
 # 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/.
 
+if not CONFIG['MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE']:
+    TEST_DIRS += [
+        'background',
+    ]
+
 TEST_DIRS += [
-    'background',
     'browser',
     'javaaddons', # Must be built before browser/robocop/roboextender.
                   # This is enforced in config/recurse.mk.