Bug 1412105: Don't hardcode objdir in build_resources_path; r?jlund draft
authorTom Prince <mozilla@hocat.ca>
Thu, 26 Oct 2017 14:38:12 -0600
changeset 687068 2ec8fe038d26d2d670b358f9d13f16c7889acab6
parent 687067 5e25805bdacf4ab8f61df210a05161b50e881617
child 737570 2c242df16339ecd8047809befeeba22d8fe24434
push id86408
push userbmo:mozilla@hocat.ca
push dateThu, 26 Oct 2017 21:08:13 +0000
reviewersjlund
bugs1412105
milestone58.0a1
Bug 1412105: Don't hardcode objdir in build_resources_path; r?jlund MozReview-Commit-ID: B82gmPToKFW
testing/mozharness/scripts/fx_desktop_build.py
--- a/testing/mozharness/scripts/fx_desktop_build.py
+++ b/testing/mozharness/scripts/fx_desktop_build.py
@@ -73,18 +73,17 @@ class FxDesktopBuild(BuildScript, TryToo
                     "%(objdir)s/dist/firefox-*",
                     "%(objdir)s/dist/fennec*",
                     "%(objdir)s/dist/seamonkey*",
                     "%(objdir)s/dist/thunderbird*",
                     "%(objdir)s/dist/install/sea/*.exe"
                 ],
                 'stage_product': 'firefox',
                 'platform_supports_post_upload_to_latest': True,
-                'build_resources_path': \
-                '%(abs_src_dir)s/obj-firefox/.mozbuild/build_resources.json',
+                'build_resources_path': '%(abs_obj_dir)s/.mozbuild/build_resources.json',
                 'nightly_promotion_branches': ['mozilla-central', 'mozilla-aurora'],
 
                 # try will overwrite these
                 'clone_with_purge': False,
                 'clone_by_revision': False,
                 'tinderbox_build_dir': None,
                 'to_tinderbox_dated': True,
                 'release_to_try_builds': False,