Bug 552253 - XPCShell no longer packages devicemanager.py properly r=ted

testing/xpcshell/Makefile.in

@@ -62,10 +62,14 @@ TEST_HARNESS_FILES := \
 
 # Extra files needed from $(topsrcdir)/build
 EXTRA_BUILD_FILES := \
-  mobile/devicemanager.py \
   automationutils.py \
   $(NULL)
 
+# And files for running xpcshell remotely from $(topsrcdir)/build/mobile
+MOBILE_BUILD_FILES := \
+  devicemanager.py \
+  $(NULL)
+
 # Components / typelibs that don't get packaged with
 # the build, but that we need for the test harness.
 TEST_HARNESS_COMPONENTS := \
@@ -84,5 +88,6 @@ stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/xpcshell/tests
 	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
 	@(cd $(topsrcdir)/build && tar $(TAR_CREATE_FLAGS) - $(EXTRA_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
+	@(cd $(topsrcdir)/build/mobile && tar $(TAR_CREATE_FLAGS) - $(MOBILE_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
 	@(cd $(DEPTH)/_tests/xpcshell/ && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/xpcshell/tests && tar -xf -)
 	@(cd $(DIST)/bin/components && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_COMPONENTS)) | (cd $(PKG_STAGE)/bin/components && tar -xf -)