532039ea2c
* chore: bump chromium in DEPS to 123.0.6300.2 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 123.0.6301.2 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: deepak1556 <hop2deep@gmail.com> * chore: bump chromium in DEPS to 123.0.6302.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 123.0.6304.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 123.0.6306.2 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 123.0.6308.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> * Refactor //components/pdf/common constants https://chromium-review.googlesource.com/c/chromium/src/+/5292816 Co-authored-by: deepak1556 <hop2deep@gmail.com> * Rename URLLoaderFactoryParams::is_corb_enabled to is_orb_enabled. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5277040 Co-authored-by: deepak1556 <hop2deep@gmail.com> * Add placeholder of speaker-selection permission. Refs https://chromium-review.googlesource.com/c/chromium/src/+/5278243 Co-authored-by: deepak1556 <hop2deep@gmail.com> * Move kPdfMimeType to //components/pdf/common/constants.h Refs https://chromium-review.googlesource.com/c/chromium/src/+/5293155 Co-authored-by: deepak1556 <hop2deep@gmail.com> * chore: gen-libc++-filenames.js Co-authored-by: deepak1556 <hop2deep@gmail.com> * Make GetClassName non virtual Refs https://chromium-review.googlesource.com/c/chromium/src/+/5293075 Refs https://issues.chromium.org/issues/324596267 Co-authored-by: deepak1556 <hop2deep@gmail.com> * chore: bump chromium in DEPS to 123.0.6310.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update filenames.libcxx.gni Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * 5282732: Compute input region using correct pixel size. https://chromium-review.googlesource.com/c/chromium/src/+/5282732 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * fixup: Make GetClassName non virtual Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * chore: bump chromium in DEPS to 123.0.6312.0 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> * chore: bump chromium in DEPS to 123.0.6312.5 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> * fixup: Make GetClassName non virtual Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> * docs: document speaker-selection https://chromium-review.googlesource.com/c/chromium/src/+/5278243 Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Keeley Hammond <vertedinde@electronjs.org>
|
|
Date: Tue, 1 Aug 2023 11:27:30 -0700
|
|
Subject: build: remove enterprise content analysis assert
|
|
|
|
Chromium is using enterprise content analysis, which is something
|
|
Electron is not concerned with. Remove this assert before building.
|
|
This patch can be removed when we decide how we want to handle
|
|
enterprise content analysis.
|
|
|
|
diff --git a/components/enterprise/buildflags/buildflags.gni b/components/enterprise/buildflags/buildflags.gni
|
|
index 4d60f9c070ed3c577e24edf0c6581a99012e17d9..a1bcc636598efc5e15accffdbb77c371185930b9 100644
|
|
--- a/components/enterprise/buildflags/buildflags.gni
|
|
+++ b/components/enterprise/buildflags/buildflags.gni
|
|
@@ -42,4 +42,4 @@ declare_args() {
|
|
# These two flags are equivalent, but `enable_print_content_analysis` still
|
|
# needs to exist separately as it lives under //printing which cannot depend
|
|
# on //components.
|
|
-assert(enterprise_content_analysis == enable_print_content_analysis)
|
|
+# assert(enterprise_content_analysis == enable_print_content_analysis)
|