From 3064815b6e290bc8a83fcf7c98a264ca55dd2cec Mon Sep 17 00:00:00 2001 From: Niranjan Yardi Date: Tue, 19 Nov 2024 13:41:49 -0800 Subject: [PATCH] Address feedback --- cobalt/build/configs/android-arm/args.gn | 2 +- cobalt/build/configs/android-arm64/args.gn | 2 +- cobalt/build/configs/android-x86/args.gn | 2 +- cobalt/build/configs/linux-x64x11/args.gn | 2 +- cobalt/build/configs/{media.gn => proprietary_codecs.gn} | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) rename cobalt/build/configs/{media.gn => proprietary_codecs.gn} (57%) diff --git a/cobalt/build/configs/android-arm/args.gn b/cobalt/build/configs/android-arm/args.gn index feb642c324f..67b8dc363c2 100644 --- a/cobalt/build/configs/android-arm/args.gn +++ b/cobalt/build/configs/android-arm/args.gn @@ -1,4 +1,4 @@ -import("cobalt/build/configs/media.gn") +import("//cobalt/build/configs/proprietary_codecs.gn") target_os = "android" target_cpu = "arm" diff --git a/cobalt/build/configs/android-arm64/args.gn b/cobalt/build/configs/android-arm64/args.gn index b1581142b2a..d11eecedaf0 100644 --- a/cobalt/build/configs/android-arm64/args.gn +++ b/cobalt/build/configs/android-arm64/args.gn @@ -1,4 +1,4 @@ -import("cobalt/build/configs/media.gn") +import("//cobalt/build/configs/proprietary_codecs.gn") target_os = "android" target_cpu = "arm64" diff --git a/cobalt/build/configs/android-x86/args.gn b/cobalt/build/configs/android-x86/args.gn index 28a7ce95b6f..4924fbbd6db 100644 --- a/cobalt/build/configs/android-x86/args.gn +++ b/cobalt/build/configs/android-x86/args.gn @@ -1,4 +1,4 @@ -import("cobalt/build/configs/media.gn") +import("//cobalt/build/configs/proprietary_codecs.gn") target_os = "android" target_cpu = "x86" diff --git a/cobalt/build/configs/linux-x64x11/args.gn b/cobalt/build/configs/linux-x64x11/args.gn index 80c4d2c0f37..147c2bcbcdf 100644 --- a/cobalt/build/configs/linux-x64x11/args.gn +++ b/cobalt/build/configs/linux-x64x11/args.gn @@ -1,4 +1,4 @@ -import("cobalt/build/configs/media.gn") +import("//cobalt/build/configs/proprietary_codecs.gn") target_os = "linux" target_cpu = "x64" diff --git a/cobalt/build/configs/media.gn b/cobalt/build/configs/proprietary_codecs.gn similarity index 57% rename from cobalt/build/configs/media.gn rename to cobalt/build/configs/proprietary_codecs.gn index ec08c6ff300..047e016b5e6 100644 --- a/cobalt/build/configs/media.gn +++ b/cobalt/build/configs/proprietary_codecs.gn @@ -2,4 +2,7 @@ # This flag is overridden to enable common video codecs playbacks. proprietary_codecs = true +# This flag is needed by both platforms - android and linux. +# For android: android_webview/docs/aosp-system-integration.md +# For linux: ffmpeg_branding = "Chrome"