From 9444174e06f54f3fa4d6f518567b34b793b2a144 Mon Sep 17 00:00:00 2001 From: Niranjan Yardi Date: Tue, 12 Nov 2024 18:31:47 -0800 Subject: [PATCH] Fix flags in chromium* args.gn files (#4420) b/377271824 While renaming the chromium and cobalt builders: https://github.com/youtube/cobalt/pull/4399 args.gn files was not set correctly. This PR sets the appropriate args.gn for chromium and cobalt builds for all platforms. --- cobalt/build/configs/chromium_android-arm/args.gn | 1 - cobalt/build/configs/chromium_android-arm64/args.gn | 1 - cobalt/build/configs/chromium_android-x86/args.gn | 1 - cobalt/build/configs/chromium_linux-x64x11/args.gn | 5 ----- cobalt/build/configs/linux-x64x11/args.gn | 5 +++++ 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cobalt/build/configs/chromium_android-arm/args.gn b/cobalt/build/configs/chromium_android-arm/args.gn index 0ae44558d30d..5c82d08c32ce 100644 --- a/cobalt/build/configs/chromium_android-arm/args.gn +++ b/cobalt/build/configs/chromium_android-arm/args.gn @@ -1,4 +1,3 @@ target_os = "android" target_cpu = "arm" is_cobalt = false -treat_warnings_as_errors = false diff --git a/cobalt/build/configs/chromium_android-arm64/args.gn b/cobalt/build/configs/chromium_android-arm64/args.gn index 5d28115f905a..ba0dc0650b5c 100644 --- a/cobalt/build/configs/chromium_android-arm64/args.gn +++ b/cobalt/build/configs/chromium_android-arm64/args.gn @@ -1,4 +1,3 @@ target_os = "android" target_cpu = "arm64" is_cobalt = false -treat_warnings_as_errors = false diff --git a/cobalt/build/configs/chromium_android-x86/args.gn b/cobalt/build/configs/chromium_android-x86/args.gn index a780ac766b22..6c790e6f014a 100644 --- a/cobalt/build/configs/chromium_android-x86/args.gn +++ b/cobalt/build/configs/chromium_android-x86/args.gn @@ -1,4 +1,3 @@ target_os = "android" target_cpu = "x86" is_cobalt = false -treat_warnings_as_errors = false diff --git a/cobalt/build/configs/chromium_linux-x64x11/args.gn b/cobalt/build/configs/chromium_linux-x64x11/args.gn index 40037ceaefcf..99041a6991fb 100644 --- a/cobalt/build/configs/chromium_linux-x64x11/args.gn +++ b/cobalt/build/configs/chromium_linux-x64x11/args.gn @@ -4,8 +4,3 @@ is_cobalt = false # TODO(b/376141256): Decide if this flag is needed here or in .gclient file chrome_pgo_phase = 0 - -# Vulkan is a new rendering (and presentation, and more) API intended to replace -# E/GL(ES). Partners are only required to support upto GLES 2.0 : https://developers.google.com/youtube/cobalt/docs/reference/starboard/modules/16/gles#gles_version -# Disable Vulkan until we formally decide to support it. -enable_vulkan = false diff --git a/cobalt/build/configs/linux-x64x11/args.gn b/cobalt/build/configs/linux-x64x11/args.gn index ce1610204c1f..5909a57c8a28 100644 --- a/cobalt/build/configs/linux-x64x11/args.gn +++ b/cobalt/build/configs/linux-x64x11/args.gn @@ -5,3 +5,8 @@ use_ozone = true # TODO(b/376141256): Decide if this flag is needed here or in .gclient file chrome_pgo_phase = 0 + +# Vulkan is a new rendering (and presentation, and more) API intended to replace +# E/GL(ES). Partners are only required to support upto GLES 2.0 : https://developers.google.com/youtube/cobalt/docs/reference/starboard/modules/16/gles#gles_version +# Disable Vulkan until we formally decide to support it. +enable_vulkan = false