Issue #1053 - Part 1c: Remove references to mobile/android targets and paths

2 files changed, 0 insertions, 37 deletions

diff --git a/testing/mochitest/Makefile.in b/testing/mochitest/Makefile.in
index 519d9cabe..7fb42f0ff 100644
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -18,19 +18,3 @@ libs::
 $(_DEST_DIR):
 	$(NSINSTALL) -D $@
 
-# On Android only, include a release signed Robocop APK in the test package.
-ifeq ($(MOZ_BUILD_APP),mobile/android)
-include $(topsrcdir)/config/android-common.mk
-
-ifndef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
-robocop_apk := $(topobjdir)/mobile/android/tests/browser/robocop/robocop-debug-unsigned-unaligned.apk
-else
-robocop_apk := $(topobjdir)/gradle/build/mobile/android/app/outputs/apk/app-automation-debug-androidTest-unaligned.apk
-endif
-
-stage-package-android:
-	$(NSINSTALL) -D $(_DEST_DIR)
-	$(call RELEASE_SIGN_ANDROID_APK,$(robocop_apk),$(_DEST_DIR)/robocop.apk)
-
-stage-package: stage-package-android
-endif
diff --git a/testing/mochitest/mach_test_package_commands.py b/testing/mochitest/mach_test_package_commands.py
index 71fe62428..01e0167e1 100644
--- a/testing/mochitest/mach_test_package_commands.py
+++ b/testing/mochitest/mach_test_package_commands.py
@@ -28,8 +28,6 @@ def run_mochitest(context, **kwargs):
         args.test_paths = map(normalize, args.test_paths)
 
     import mozinfo
-    if mozinfo.info.get('buildapp') == 'mobile/android':
-        return run_mochitest_android(context, args)
     return run_mochitest_desktop(context, args)
 
 
@@ -42,29 +40,10 @@ def run_mochitest_desktop(context, args):
     return run_test_harness(parser, args)
 
 
-def run_mochitest_android(context, args):
-    args.app = args.app or 'org.mozilla.fennec'
-    args.extraProfileFiles.append(os.path.join(context.package_root, 'mochitest', 'fonts'))
-    args.utilityPath = context.hostutils
-    args.xrePath = context.hostutils
-
-    config = context.mozharness_config
-    if config:
-        args.remoteWebServer = config['remote_webserver']
-        args.httpPort = config['emulator']['http_port']
-        args.sslPort = config['emulator']['ssl_port']
-        args.adbPath = config['exes']['adb'] % {'abs_work_dir': context.mozharness_workdir}
-
-    from runtestsremote import run_test_harness
-    return run_test_harness(parser, args)
-
-
 def setup_argument_parser():
     import mozinfo
     mozinfo.find_and_update_from_json(here)
     app = 'generic'
-    if mozinfo.info.get('buildapp') == 'mobile/android':
-        app = 'android'
 
     from mochitest_options import MochitestArgumentParser
     global parser