diff --git a/chromiumcontent/args/ffmpeg.gn b/chromiumcontent/args/ffmpeg.gn index ec4deb67..65cb35ac 100644 --- a/chromiumcontent/args/ffmpeg.gn +++ b/chromiumcontent/args/ffmpeg.gn @@ -15,11 +15,8 @@ if (target_os != "linux") { # Jumbo build should improve compilation times. # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md use_jumbo_build = true -if (target_cpu == "arm64") { - # Temporary disable on arm64 due to "error: '__' macro redefined". - # Should be enabled back eventually. - use_jumbo_build = false +if (target_cpu == "arm64") { # Suppress the linking warning for arm64: # warning: libfreetype.so.6, needed by ../../build/linux/debian_jessie_arm64-sysroot/usr/lib/aarch64-linux-gnu/libfontconfig.so, may conflict with libfreetype.so.6 fatal_linker_warnings = false diff --git a/chromiumcontent/args/shared_library.gn b/chromiumcontent/args/shared_library.gn index 38b2674a..cba8eacb 100644 --- a/chromiumcontent/args/shared_library.gn +++ b/chromiumcontent/args/shared_library.gn @@ -18,11 +18,6 @@ if (target_os != "linux") { # Jumbo build should improve compilation times. # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md use_jumbo_build = true -if (target_cpu == "arm64") { - # Temporary disable on arm64 due to "error: '__' macro redefined". - # Should be enabled back eventually. - use_jumbo_build = false -} # This is required by Node.js # See https://github.com/nodejs/node/pull/13242 diff --git a/chromiumcontent/args/static_library.gn b/chromiumcontent/args/static_library.gn index a4be224c..9ecef2ba 100644 --- a/chromiumcontent/args/static_library.gn +++ b/chromiumcontent/args/static_library.gn @@ -22,11 +22,6 @@ if (target_os != "linux") { # Jumbo build should improve compilation times. # https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md use_jumbo_build = true -if (target_cpu == "arm64") { - # Temporary disable on arm64 due to "error: '__' macro redefined". - # Should be enabled back eventually. - use_jumbo_build = false -} # This is required by Node.js # See https://github.com/nodejs/node/pull/13242