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

Unified Diff: build/linux/sysroot_scripts/install-sysroot.py

Issue 1141003002: Move linux sysroots from chrome/installer/linux to build/linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months 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 | « build/linux/OWNERS ('k') | build/linux/sysroot_scripts/packagelist.trusty.arm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/linux/sysroot_scripts/install-sysroot.py
diff --git a/chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
similarity index 98%
rename from chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py
rename to build/linux/sysroot_scripts/install-sysroot.py
index dfca9a60cc2daaffb2d1e7616904de06d00e449f..99fc2d6f459b4178651642b52b237584daeb4d34 100755
--- a/chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py
+++ b/build/linux/sysroot_scripts/install-sysroot.py
@@ -75,9 +75,8 @@ def DetectArch(gyp_defines):
# Figure out host arch using build/detect_host_arch.py and
# set target_arch to host arch
- SRC_DIR = os.path.abspath(
- os.path.join(SCRIPT_DIR, '..', '..', '..', '..'))
- sys.path.append(os.path.join(SRC_DIR, 'build'))
+ build_dir = os.path.dirname(os.path.dirname(os.path.join(SCRIPT_DIR)))
+ sys.path.append(build_dir)
import detect_host_arch
detected_host_arch = detect_host_arch.HostArch()
« no previous file with comments | « build/linux/OWNERS ('k') | build/linux/sysroot_scripts/packagelist.trusty.arm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698