Bug 1066735 - Remove root b2g and android specific xpcshell manifests, r=chmanchester

This commit is contained in:
Andrew Halberstadt
2014-10-07 18:18:28 -04:00
parent e1fdc553f5
commit 11b824f09b
149 changed files with 155 additions and 107 deletions

View File

@@ -257,7 +257,7 @@ class AndroidXPCShellRunner(MozbuildObject):
options.localBin = os.path.join(self.topobjdir, 'dist/bin')
options.testingModulesDir = os.path.join(self.topobjdir, '_tests/modules')
options.mozInfo = os.path.join(self.topobjdir, 'mozinfo.json')
options.manifest = os.path.join(self.topobjdir, '_tests/xpcshell/xpcshell_android.ini')
options.manifest = os.path.join(self.topobjdir, '_tests/xpcshell/xpcshell.ini')
options.symbolsPath = os.path.join(self.distdir, 'crashreporter-symbols')
if local_apk:
options.localAPK = local_apk
@@ -379,7 +379,7 @@ class B2GXPCShellRunner(MozbuildObject):
options.localLib = self.bin_dir
options.localBin = self.bin_dir
options.logdir = self.xpcshell_dir
options.manifest = os.path.join(self.xpcshell_dir, 'xpcshell_b2g.ini')
options.manifest = os.path.join(self.xpcshell_dir, 'xpcshell.ini')
options.mozInfo = os.path.join(self.topobjdir, 'mozinfo.json')
options.objdir = self.topobjdir
options.symbolsPath = os.path.join(self.distdir, 'crashreporter-symbols'),