Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Unified Diff: build/linux/sysroot_scripts/build_and_upload.py

Issue 2599763004: Update Sysroots (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/linux/sysroot_scripts/packagelist.precise.amd64 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/sysroot_scripts/build_and_upload.py
diff --git a/build/linux/sysroot_scripts/build_and_upload.py b/build/linux/sysroot_scripts/build_and_upload.py
index 9865dc3590a99587543d87b0be907213fd641677..bdbd73dddf5d0e0e0c884cfb7e1655300bcc71ed 100755
--- a/build/linux/sysroot_scripts/build_and_upload.py
+++ b/build/linux/sysroot_scripts/build_and_upload.py
@@ -45,8 +45,7 @@ def build_and_upload(script_path, distro, release, arch, lock):
run_script([script_path, 'UploadSysroot%s' % arch, revision])
tarball = '%s_%s_%s_sysroot.tgz' % (distro, release, arch.lower())
- tgz_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),
- "..", "..", "..", "out", "sysroot-build",
+ tgz_path = os.path.join(script_dir, "..", "..", "..", "out", "sysroot-build",
release, tarball)
sha1sum = sha1sumfile(tgz_path)
sysroot_dir = '%s_%s_%s-sysroot' % (distro, release, arch.lower())
@@ -58,7 +57,7 @@ def build_and_upload(script_path, distro, release, arch, lock):
'SysrootDir': sysroot_dir
}
with lock:
- with open('sysroots.json', 'rw+') as f:
+ with open(os.path.join(script_dir, 'sysroots.json'), 'rw+') as f:
sysroots = json.load(f)
sysroots["%s_%s" % (release, arch.lower())] = sysroot_metadata
f.seek(0)
« no previous file with comments | « no previous file | build/linux/sysroot_scripts/packagelist.precise.amd64 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698