Bug 1160662 - Refer to robocop.ini in $OBJDIR/_tests, not $OBJDIR. r=margaret

testing/mochitest/mach_commands.py

@@ -1122,9 +1122,9 @@ class AndroidCommands(MachCommandBase):
             '--robocop-ini=' +
             os.path.join(
                 self.topobjdir,
-                'build',
-                'mobile',
-                'robocop',
+                '_tests',
+                'testing',
+                'mochitest',
                 'robocop.ini'),
             '--log-mach=-',
         ]

testing/testsuite-targets.mk

@@ -66,7 +66,7 @@ RUN_MOCHITEST_ROBOCOP = \
   $(PYTHON) _tests/testing/mochitest/runtestsremote.py \
     --robocop-apk=$(DEPTH)/build/mobile/robocop/robocop-debug.apk \
     --robocop-ids=$(DEPTH)/mobile/android/base/fennec_ids.txt \
-    --robocop-ini=$(DEPTH)/build/mobile/robocop/robocop.ini \
+    --robocop-ini=_tests/testing/mochitest/robocop.ini \
     --console-level=INFO --log-tbpl=./$@.log $(DM_FLAGS) --dm_trans=$(DM_TRANS) \
     --app=$(TEST_PACKAGE_NAME) --deviceIP=${TEST_DEVICE} --xre-path=${MOZ_HOST_BIN} \
     $(SYMBOLS_PATH) $(TEST_PATH_ARG) $(EXTRA_TEST_ARGS)