diff options
| -rw-r--r-- | build/config/BUILD.gn | 11 | ||||
| -rw-r--r-- | third_party/widevine/cdm/BUILD.gn | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index 2427b72..3857648 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -41,9 +41,8 @@ declare_args() { # # For now we define these globally to match the current GYP build. config("feature_flags") { - # TODO(brettw) most of these need to be parameterized. + # TODO(brettw) this probably needs to be parameterized. defines = [ - "CHROMIUM_BUILD", "V8_DEPRECATION_WARNINGS", # Don't use deprecated V8 APIs anywhere. ] @@ -239,6 +238,14 @@ config("feature_flags") { defines += [ "MOBILE_SAFE_BROWSING" ] defines += [ "SAFE_BROWSING_SERVICE" ] } + if (is_official_build) { + defines += [ "OFFICIAL_BUILD" ] + } + if (is_chrome_branded) { + defines += [ "GOOGLE_CHROME_BUILD" ] + } else { + defines += [ "CHROMIUM_BUILD" ] + } } # Debug/release ---------------------------------------------------------------- diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn index 62dad95..99ca959 100644 --- a/third_party/widevine/cdm/BUILD.gn +++ b/third_party/widevine/cdm/BUILD.gn @@ -110,22 +110,17 @@ if (widevine_cdm_binary_files != []) { } if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) { - adapter_resource_file = "$target_gen_dir/widevinecdmadapter_version.rc" - - # Produce the .rc file. + # Produce and compile the .rc file. process_version("widevinecdmadapter_resources") { visibility = [ ":*" ] sources = [ "BRANDING", "widevinecdmadapter.ver", ] - output = adapter_resource_file + output = "$target_gen_dir/widevinecdmadapter_version.rc" } cdm_adapter("widevinecdmadapter") { - sources = [ - adapter_resource_file, - ] deps = [ ":widevinecdmadapter_resources", ":widevinecdm", |