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

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

Issue 2476343004: GN: Add an option to build against the Debian wheezy sysroot (Closed)
Patch Set: Created 4 years, 1 month 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/detect_host_arch.py ('k') | tools/gn.py » ('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/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py
index 99fc2d6f459b4178651642b52b237584daeb4d34..f305f262875d51beb18cf41cda37ab5d638451cb 100755
--- a/build/linux/sysroot_scripts/install-sysroot.py
+++ b/build/linux/sysroot_scripts/install-sysroot.py
@@ -108,18 +108,6 @@ def main():
print 'Unable to detect host architecture'
return 1
- if options.running_as_hook and target_arch != 'arm' and target_arch != 'mips':
- # When run from runhooks, only install the sysroot for an Official Chrome
- # Linux build, except on ARM where we always use a sysroot.
- skip_if_defined = ['branding=Chrome', 'buildtype=Official']
- skip_if_undefined = ['chromeos=1']
- for option in skip_if_defined:
- if option not in gyp_defines:
- return 0
- for option in skip_if_undefined:
- if option in gyp_defines:
- return 0
-
# The sysroot directory should match the one specified in build/common.gypi.
# TODO(thestig) Consider putting this else where to avoid having to recreate
# it on every build.
« no previous file with comments | « build/detect_host_arch.py ('k') | tools/gn.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698