www-client/chromium: beta channel bump (68.0.3440.25)

Package-Manager: Portage-2.3.40_p14, Repoman-2.3.9_p246

6 files changed, 4 insertions, 483 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index c08b9f6d6001..dbffd378cc48 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 DIST chromium-67.0.3396.62.tar.xz 591452000 BLAKE2B 01d63d21548fcfc707e3ab1d293f24f34237784ec87949e2886a364d7e8f517f82e98803f45b690111a31304d269917442305d04fa13c34180f852007280a78c SHA512 c768701a04600f6dd981ea036a28973df104281dcdadda20d0ae515a0b80112b94840cee36823676c4b4cd71e0e6ef069af801f746fea29d65f978a3666f6cb0
 DIST chromium-67.0.3396.79.tar.xz 591459156 BLAKE2B c62a54ceaf240a06ce54ff2e13ea1c22bb89c7d88628ab005230ded307b44836c96f12fc85cef85fe088fbed66e203bc359d2b516347969d733e99b0e6d143b6 SHA512 4b7cd2cdc5a2b784e61498e945dbac0a086f2ff9224e0c050f85ab86183602860b34dc305c99730c31478820e48a1da4570284359f13275ab2b10592190cbca8
 DIST chromium-67.0.3396.87.tar.xz 591491608 BLAKE2B 9069c4b2e000e180a9b21bbdbb67428817073cd662830f7e736073833f2e6ab2f94f3127d15ed521e34c82de727f137e0065fd3aa7fa7312c4940b1bd8959ccc SHA512 6f9c108b70b63cd45e8238c1962ec11d4f2d01e4f2a6b6483bfafc7986ed6001d5f09f9b0b893c864a08bade9d93346395bb2d045dcafb2ef94b0f4e00f2fe0d
-DIST chromium-68.0.3438.3.tar.xz 624448788 BLAKE2B 25e8f6bfc9171f17a634caa8974a01dba8e0b40dba78534f8b04cbced98566ce8addba65907165599587d0120563073f051af2af19601e4556182b9ec5442113 SHA512 2ff17270acee971bf9a2770b826f919979f24ab7be12a00504ad0b16e72f21fd70f7dc543e8823f8c1737ff785ae900e999d2e82153ff84d0b33cf68ad82a2a2
 DIST chromium-68.0.3440.17.tar.xz 624240248 BLAKE2B 9322f731efbc218dbefec351984f93bac5deedee3cc5ce426a619262d885097f28d8532a3d5b55e8daacd2c28dee2dd85dd4063687cbc7ed7d125d2a2a48f885 SHA512 1a6af7c5f3bfe87b37844c9d863f512aa464de75252487877d7796fa0dc246a533357086c64701f624809493eef97fced23d3eaa449819b38ce6038227015d35
+DIST chromium-68.0.3440.25.tar.xz 624353904 BLAKE2B 8ed052e5ad831499367ef1e6d40d08bb585e49855f4c6b820d5532c96f240ad312e66484b75b5b8398e737e2400b7ff1f9edd944b5f6a16d81ace019f6dd0952 SHA512 c82436dc42dd9ee1b87881d617f6c791a9dc04d85bb1d4588a3cf31009edd8aeb9d89c357581f705e3602580be1d70ab5fd85f629abf7c7f647fa8a5f06f3add
diff --git a/www-client/chromium/chromium-68.0.3438.3.ebuild b/www-client/chromium/chromium-68.0.3440.25.ebuild
index 804f17a0e7d5..13d9aa7c022f 100644
--- a/www-client/chromium/chromium-68.0.3438.3.ebuild
+++ b/www-client/chromium/chromium-68.0.3440.25.ebuild
@@ -132,13 +132,14 @@ GTK+ icon theme.
 PATCHES=(
 	"${FILESDIR}/chromium-widevine-r2.patch"
 	"${FILESDIR}/chromium-compiler-r2.patch"
-	#"${FILESDIR}/chromium-ffmpeg-build-r0.patch"
 	"${FILESDIR}/chromium-webrtc-r0.patch"
 	"${FILESDIR}/chromium-memcpy-r0.patch"
 	"${FILESDIR}/chromium-math.h-r0.patch"
 	"${FILESDIR}/chromium-stdint.patch"
 	"${FILESDIR}/chromium-ffmpeg-r1.patch"
-	"${FILESDIR}/chromium-gn-bootstrap-r24.patch"
+	"${FILESDIR}/chromium-libjpeg-r0.patch"
+	"${FILESDIR}/chromium-cors-string-r0.patch"
+	"${FILESDIR}/chromium-libwebp-shim-r0.patch"
 )
 
 pre_build_checks() {
@@ -266,7 +267,6 @@ src_prepare() {
 		third_party/libXNVCtrl
 		third_party/libaddressinput
 		third_party/libaom
-		third_party/libaom/source/libaom/third_party/x86inc
 		third_party/libjingle
 		third_party/libphonenumber
 		third_party/libsecret
diff --git a/www-client/chromium/files/chromium-compiler-r1.patch b/www-client/chromium/files/chromium-compiler-r1.patch
deleted file mode 100644
index 3c75c1d96dff..000000000000
--- a/www-client/chromium/files/chromium-compiler-r1.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From f1e0c5fc3b81053c8851efde9ca77e04c77d4563 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 67 +++++++++-------------------------
- 1 file changed, 18 insertions(+), 49 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 3dbf872f7038..f8b2dcc9b026 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -222,8 +222,6 @@ config("compiler") {
- 
-   configs += [
-     # See the definitions below.
--    ":clang_revision",
--    ":compiler_cpu_abi",
-     ":compiler_codegen",
-   ]
- 
-@@ -474,24 +472,6 @@ config("compiler") {
-     cflags += [ "-fcolor-diagnostics" ]
-   }
- 
--  if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
--      target_os != "chromeos") {
--    cflags += [
--      # TODO(hans): Remove this once Clang generates better optimized debug info
--      # by default. https://crbug.com/765793
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-instcombine-lower-dbg-declare=0",
--
--      # TODO(rnk): Remove this once it's the default. https://crbug.com/793819
--      "-Xclang",
--      "-mllvm",
--      "-Xclang",
--      "-fast-isel-sink-local-values=1",
--    ]
--  }
--
-   # Print absolute paths in diagnostics. There is no precedent for doing this
-   # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
-   # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -1403,10 +1383,6 @@ config("default_warnings") {
- 
-         # TODO(hans): https://crbug.com/766891
-         "-Wno-null-pointer-arithmetic",
--
--        # Ignore warnings about MSVC optimization pragmas.
--        # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
--        "-Wno-ignored-pragma-optimize",
-       ]
-     } else if (use_xcode_clang) {
-       cflags += [
-@@ -1450,22 +1426,6 @@ config("chromium_code") {
-       "__STDC_FORMAT_MACROS",
-     ]
- 
--    if (!is_debug && !using_sanitizer &&
--        (!is_linux || !is_clang || is_official_build) &&
--        current_cpu != "s390x" && current_cpu != "s390" &&
--        current_cpu != "ppc64" && current_cpu != "ppc64" &&
--        current_cpu != "mips" && current_cpu != "mips64") {
--      # _FORTIFY_SOURCE isn't really supported by Clang now, see
--      # http://llvm.org/bugs/show_bug.cgi?id=16821.
--      # It seems to work fine with Ubuntu 12 headers though, so use it in
--      # official builds.
--      #
--      # Non-chromium code is not guaranteed to compile cleanly with
--      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
--      # disabled, so only do that for Release build.
--      defines += [ "_FORTIFY_SOURCE=2" ]
--    }
--
-     if (is_mac || is_ios) {
-       cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
-       cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1799,7 +1759,8 @@ config("default_stack_frames") {
- }
- 
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
-   if (is_win) {
-     # TODO(thakis): Remove is_clang here, https://crbug.com/598772
-     if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1833,7 +1794,8 @@ config("optimize") {
- }
- 
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
-   if (is_win) {
-     # Favor size over speed, /O1 must be before the common flags. The GYP
-     # build also specifies /Os and /GF but these are implied by /O1.
-@@ -1856,7 +1818,8 @@ config("optimize_no_wpo") {
- }
- 
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = [
-       "/Od",  # Disable optimization.
-@@ -1880,7 +1843,8 @@ config("no_optimize") {
- # Turns up the optimization level. On Windows, this implies whole program
- # optimization and link-time code generation which is very expensive and should
- # be used sparingly.
--config("optimize_max") {
-+config("optimize_max") { }
-+config("xoptimize_max") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -1927,7 +1891,8 @@ config("optimize_max") {
- #
- # TODO(crbug.com/621335) - rework how all of these configs are related
- # so that we don't need this disclaimer.
--config("optimize_speed") {
-+config("optimize_speed") { }
-+config("xoptimize_speed") {
-   if (is_nacl && is_nacl_irt) {
-     # The NaCl IRT is a special case and always wants its own config.
-     # Various components do:
-@@ -1965,7 +1930,8 @@ config("optimize_speed") {
-   }
- }
- 
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
-   cflags = [ "-O1" ] + common_optimize_on_cflags
-   ldflags = common_optimize_on_ldflags
-   visibility = [ ":default_optimization" ]
-@@ -2047,7 +2013,8 @@ config("afdo") {
- #   configs += [ "//build/config/compiler:symbols" ]
- 
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
-   if (is_win) {
-     if (use_goma || is_clang) {
-       # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2139,7 +2106,8 @@ config("symbols") {
- # Minimal symbols.
- # This config guarantees to hold symbol for stack trace which are shown to user
- # when crash happens in unittests running on buildbot.
--config("minimal_symbols") {
-+config("minimal_symbols") { }
-+config("xminimal_symbols") {
-   if (is_win) {
-     # Linker symbols for backtraces only.
-     cflags = []
-@@ -2170,7 +2138,8 @@ config("minimal_symbols") {
- }
- 
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
-   if (!is_win) {
-     cflags = [ "-g0" ]
-     asmflags = cflags
--- 
-2.17.0
-
diff --git a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch b/www-client/chromium/files/chromium-ffmpeg-build-r0.patch
deleted file mode 100644
index 5d9d0d26ecd5..000000000000
--- a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From 92b5903a360931a7ba335fc10ae2e0802652326b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 6 May 2018 13:13:37 -0400
-Subject: [PATCH] Remove arch-specic code from build_ffmpeg.py
-
----
- chromium/scripts/build_ffmpeg.py | 185 -------------------------------
- 1 file changed, 185 deletions(-)
-
-diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py
-index aa1fc54755..d7d8878db6 100755
---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
-@@ -534,201 +534,16 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs,
-     configure_flags['Common'].extend(SetupAndroidToolchain(target_arch))
-   else:
-     configure_flags['Common'].extend([
--        # --optflags doesn't append multiple entries, so set all at once.
--        '--optflags="-O2"',
-         '--enable-decoder=theora,vp8',
-         '--enable-parser=vp3,vp8',
-     ])
- 
--  if target_os in ('linux', 'linux-noasm', 'android'):
--    if target_arch == 'x64':
--      if target_os == 'android':
--        configure_flags['Common'].extend([
--            '--arch=x86_64',
--        ])
--      if target_os != 'android':
--        configure_flags['Common'].extend(['--enable-lto'])
--      pass
--    elif target_arch == 'ia32':
--      configure_flags['Common'].extend([
--          '--arch=i686',
--          '--extra-cflags="-m32"',
--          '--extra-ldflags="-m32"',
--      ])
--      # Android ia32 can't handle textrels and ffmpeg can't compile without
--      # them.  http://crbug.com/559379
--      if target_os == 'android':
--        configure_flags['Common'].extend([
--            '--disable-x86asm',
--        ])
--    elif target_arch == 'arm' or target_arch == 'arm-neon':
--      # TODO(ihf): ARM compile flags are tricky. The final options
--      # overriding everything live in chroot /build/*/etc/make.conf
--      # (some of them coming from src/overlays/overlay-<BOARD>/make.conf).
--      # We try to follow these here closely. In particular we need to
--      # set ffmpeg internal #defines to conform to make.conf.
--      # TODO(ihf): For now it is not clear if thumb or arm settings would be
--      # faster. I ran experiments in other contexts and performance seemed
--      # to be close and compiler version dependent. In practice thumb builds are
--      # much smaller than optimized arm builds, hence we go with the global
--      # CrOS settings.
--      configure_flags['Common'].extend([
--          '--arch=arm',
--          '--enable-armv6',
--          '--enable-armv6t2',
--          '--enable-vfp',
--          '--enable-thumb',
--          '--extra-cflags=-march=armv7-a',
--      ])
--
--      if target_os == 'android':
--        configure_flags['Common'].extend([
--            # Runtime neon detection requires /proc/cpuinfo access, so ensure
--            # av_get_cpu_flags() is run outside of the sandbox when enabled.
--            '--enable-neon',
--            '--extra-cflags=-mtune=generic-armv7-a',
--            # Enabling softfp lets us choose either softfp or hardfp when doing
--            # the chrome build.
--            '--extra-cflags=-mfloat-abi=softfp',
--        ])
--        if target_arch == 'arm':
--          print('arm-neon is the only supported arm arch for Android.\n')
--          return 1
--
--        if target_arch == 'arm-neon':
--          configure_flags['Common'].extend([
--              '--extra-cflags=-mfpu=neon',
--          ])
--        else:
--          configure_flags['Common'].extend([
--              '--extra-cflags=-mfpu=vfpv3-d16',
--          ])
--      else:
--        if host_arch != 'arm':
--          configure_flags['Common'].extend([
--              '--enable-cross-compile',
--              '--target-os=linux',
--              '--extra-cflags=--target=arm-linux-gnueabihf',
--              '--extra-ldflags=--target=arm-linux-gnueabihf',
--              '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR,
--                                          'build/linux/debian_sid_arm-sysroot'),
--              '--extra-cflags=-mtune=cortex-a8',
--              # NOTE: we don't need softfp for this hardware.
--              '--extra-cflags=-mfloat-abi=hard',
--              # For some reason configure drops this...
--              '--extra-cflags=-O2',
--          ])
--
--        if target_arch == 'arm-neon':
--          configure_flags['Common'].extend([
--              '--enable-neon',
--              '--extra-cflags=-mfpu=neon',
--          ])
--        else:
--          configure_flags['Common'].extend([
--              '--disable-neon',
--              '--extra-cflags=-mfpu=vfpv3-d16',
--          ])
--    elif target_arch == 'arm64':
--      if target_os != 'android':
--        configure_flags['Common'].extend([
--            '--enable-cross-compile',
--            '--cross-prefix=/usr/bin/aarch64-linux-gnu-',
--            '--target-os=linux',
--            '--extra-cflags=--target=aarch64-linux-gnu',
--            '--extra-ldflags=--target=aarch64-linux-gnu',
--            '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR,
--                                        'build/linux/debian_sid_arm64-sysroot'),
--        ])
--      configure_flags['Common'].extend([
--          '--arch=aarch64',
--          '--enable-armv8',
--          '--extra-cflags=-march=armv8-a',
--      ])
--    elif target_arch == 'mipsel':
--      # These flags taken from android chrome build with target_cpu='mipsel'
--      configure_flags['Common'].extend([
--          '--arch=mipsel',
--          '--disable-mips32r6',
--          '--disable-mips32r5',
--          '--disable-mips32r2',
--          '--disable-mipsdsp',
--          '--disable-mipsdspr2',
--          '--disable-msa',
--          '--enable-mipsfpu',
--          '--extra-cflags=-march=mipsel',
--          '--extra-cflags=-mcpu=mips32',
--          # Required to avoid errors about dynamic relocation w/o -fPIC.
--          '--extra-ldflags=-z notext',
--      ])
--      if target_os == 'linux':
--        configure_flags['Common'].extend([
--            '--enable-cross-compile',
--            '--target-os=linux',
--            '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR,
--                                        'build/linux/debian_sid_mips-sysroot'),
--            '--extra-cflags=--target=mipsel-linux-gnu',
--            '--extra-ldflags=--target=mipsel-linux-gnu',
--        ])
--    elif target_arch == 'mips64el':
--      # These flags taken from android chrome build with target_cpu='mips64el'
--      configure_flags['Common'].extend([
--          '--arch=mips64el',
--          '--enable-mipsfpu',
--          '--disable-mipsdsp',
--          '--disable-mipsdspr2',
--          '--extra-cflags=-march=mips64el',
--          # Required to avoid errors about dynamic relocation w/o -fPIC.
--          '--extra-ldflags=-z notext',
--      ])
--      if target_os == 'android':
--        configure_flags['Common'].extend([
--            '--enable-mips64r6',
--            '--extra-cflags=-mcpu=mips64r6',
--            '--disable-mips64r2',
--            '--enable-msa',
--        ])
--      if target_os == 'linux':
--        configure_flags['Common'].extend([
--            '--enable-cross-compile',
--            '--target-os=linux',
--            '--sysroot=' + os.path.join(
--                CHROMIUM_ROOT_DIR, 'build/linux/debian_sid_mips64el-sysroot'),
--            '--enable-mips64r2',
--            '--disable-mips64r6',
--            '--disable-msa',
--            '--extra-cflags=-mcpu=mips64r2',
--            '--extra-cflags=--target=mips64el-linux-gnuabi64',
--            '--extra-ldflags=--target=mips64el-linux-gnuabi64',
--        ])
--    else:
--      print(
--          'Error: Unknown target arch %r for target OS %r!' % (target_arch,
--                                                               target_os),
--          file=sys.stderr)
--      return 1
--
-   if target_os == 'linux-noasm':
-     configure_flags['Common'].extend([
-         '--disable-asm',
-         '--disable-inline-asm',
-     ])
- 
--  if 'win' not in target_os:
--    configure_flags['Common'].extend([
--        '--enable-pic',
--        '--cc=clang',
--        '--cxx=clang++',
--        '--ld=clang',
--    ])
--
--    # Clang Linux will use the first 'ld' it finds on the path, which will
--    # typically be the system one, so explicitly configure use of Clang's
--    # ld.lld, to ensure that things like cross-compilation and LTO work.
--    # This does not work for arm64, ia32 and is always used on mac.
--    if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac':
--      configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld')
--
-   # Should be run on Mac.
-   if target_os == 'mac':
-     if host_os != 'mac':
--- 
-2.17.0
-
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r23.patch b/www-client/chromium/files/chromium-gn-bootstrap-r23.patch
deleted file mode 100644
index e826a4dfc37b..000000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r23.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0d3bbfb6b8ba05af199b49f5dd71d842f6acffda Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Fri, 27 Apr 2018 18:07:35 +0000
-Subject: [PATCH] Fix gn bootstrap
-
-BUG=837312
-R=dpranke
-
-Change-Id: Ia5c57f596388a4ba325208c638fac558984202f0
-Reviewed-on: https://chromium-review.googlesource.com/1030895
-Reviewed-by: Dirk Pranke <dpranke@chromium.org>
-Commit-Queue: Dirk Pranke <dpranke@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#554419}
----
- tools/gn/bootstrap/bootstrap.py | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 7fa9f0489f5b..ebc32371acc3 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -525,8 +525,11 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain):
-       'base/location.cc',
-       'base/logging.cc',
-       'base/md5.cc',
-+      'base/memory/platform_shared_memory_region.cc',
-+      'base/memory/read_only_shared_memory_region.cc',
-       'base/memory/ref_counted.cc',
-       'base/memory/ref_counted_memory.cc',
-+      'base/memory/shared_memory_mapping.cc',
-       'base/memory/shared_memory_handle.cc',
-       'base/memory/shared_memory_tracker.cc',
-       'base/memory/weak_ptr.cc',
-@@ -663,6 +666,19 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain):
-       'base/vlog.cc',
-   ])
- 
-+  if is_win:
-+    static_libraries['base']['sources'].extend([
-+        'base/memory/platform_shared_memory_region_win.cc'
-+    ])
-+  elif is_mac:
-+    static_libraries['base']['sources'].extend([
-+        'base/memory/platform_shared_memory_region_mac.cc'
-+    ])
-+  elif is_posix:
-+    static_libraries['base']['sources'].extend([
-+        'base/memory/platform_shared_memory_region_posix.cc'
-+    ])
-+
-   if is_posix:
-     static_libraries['base']['sources'].extend([
-         'base/base_paths_posix.cc',
--- 
-2.17.0
-
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch
deleted file mode 100644
index 0577dd4cf73b..000000000000
--- a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8aca6d50942218ba7887b8b41a44e4f1b7d6f091 Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Thu, 24 May 2018 22:39:20 +0000
-Subject: [PATCH] Fix gn bootstrap
-
-R=dpranke
-
-Change-Id: I469e7e478141e7c389f7a16a5e860122785bab44
-Reviewed-on: https://chromium-review.googlesource.com/1072740
-Reviewed-by: Dirk Pranke <dpranke@chromium.org>
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#561663}
----
- tools/gn/bootstrap/bootstrap.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 0d5f42a1d4a8..300abacdbca0 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -649,7 +649,6 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain):
-       'base/trace_event/memory_peak_detector.cc',
-       'base/trace_event/memory_usage_estimator.cc',
-       'base/trace_event/process_memory_dump.cc',
--      'base/trace_event/sharded_allocation_register.cc',
-       'base/trace_event/trace_buffer.cc',
-       'base/trace_event/trace_config.cc',
-       'base/trace_event/trace_config_category_filter.cc',
--- 
-2.17.0
-