Initial revision

1 files changed, 42 insertions, 0 deletions

diff --git a/chromium/build/patches/gn_bootstrap_remove_sysroot-options.patch b/chromium/build/patches/gn_bootstrap_remove_sysroot-options.patch
new file mode 100644
index 00000000..210c5cf2
--- /dev/null
+++ b/chromium/build/patches/gn_bootstrap_remove_sysroot-options.patch
@@ -0,0 +1,42 @@
+From 4849d9a19f700961e2c25b642bdaaa6514040e60 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Tue, 13 Nov 2018 15:41:11 +0000
+Subject: [PATCH] gn bootstrap: Remove sysroot-related options
+
+https://gn-review.googlesource.com/c/gn/+/3200 removed the --no-sysroot
+option from gen.py and moved to only use a sysroot in the GN bots, so the
+options here no longer have any effect.
+
+Bug: 904350
+Change-Id: Ieddc71a4f8f802c2d050de1c69ca3a9ec788ee88
+Reviewed-on: https://chromium-review.googlesource.com/c/1333391
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Cr-Commit-Position: refs/heads/master@{#607596}
+---
+
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 261fddd..1945852 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -46,10 +46,6 @@
+       '--build-path',
+       help='The directory in which to build gn, '
+       'relative to the src directory. (eg. out/Release)')
+-  parser.add_option(
+-      '--with-sysroot',
+-      action='store_true',
+-      help='Download and build with the Debian sysroot.')
+   parser.add_option('-v', '--verbose', help='ignored')
+   parser.add_option(
+       '--skip-generate-buildfiles',
+@@ -76,8 +72,6 @@
+       '--no-last-commit-position',
+       '--out-path=' + gn_build_dir,
+   ]
+-  if not options.with_sysroot:
+-    cmd.append('--no-sysroot')
+   if options.debug:
+     cmd.append('--debug')
+   subprocess.check_call(cmd)
+