diff --git a/build/args/release.gn b/build/args/release.gn index e5017f6e1..59207b389 100644 --- a/build/args/release.gn +++ b/build/args/release.gn @@ -1,6 +1,4 @@ import("all.gn") -is_component_build = false -is_official_build = true # This may be guarded behind is_chrome_branded alongside # proprietary_codecs https://webrtc-review.googlesource.com/c/src/+/36321, @@ -8,9 +6,3 @@ is_official_build = true # The initialization of the decoder depends on whether ffmpeg has # been built with H.264 support. rtc_use_h264 = proprietary_codecs - -# By default, Electron builds ffmpeg with proprietary codecs enabled. In order -# to facilitate users who don't want to ship proprietary codecs in ffmpeg, or -# who have an LGPL requirement to ship ffmpeg as a dynamically linked library, -# we build ffmpeg as a shared library. -is_component_ffmpeg = true diff --git a/build/npm.gni b/build/npm.gni index a1987d095..fb33a14c3 100644 --- a/build/npm.gni +++ b/build/npm.gni @@ -35,7 +35,6 @@ template("npm_action") { if (!defined(deps)) { deps = [] } - deps += [ ":npm_pre_flight_" + target_name ] script = "//electron/build/npm-run.py" args = [ diff --git a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch index 0dc9916be..7eaa46bf5 100644 --- a/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch +++ b/patches/node/fix_add_default_values_for_enable_lto_and_build_v8_with_gn_in.patch @@ -30,7 +30,7 @@ + # these values being accurate. + 'build_v8_with_gn': 'false', + 'enable_lto%': 'false', -+ ++ 'openssl_fips': '', 'conditions': [ ['target_arch=="arm64"', { # Disabled pending https://github.com/nodejs/node/issues/23913.