diff options
| author | brettw <brettw@chromium.org> | 2015-05-11 19:01:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-12 02:01:29 +0000 |
| commit | 303920e6cd9d352e7a7b4e9bdcc2f28a30ac22fa (patch) | |
| tree | db419c249f2802e7aea6bcd37ce9095b9784a0cb /third_party/widevine | |
| parent | ca9edf06f6a2fba3836ba888c3e008fbaf1ab232 (diff) | |
| download | chromium_src-303920e6cd9d352e7a7b4e9bdcc2f28a30ac22fa.zip chromium_src-303920e6cd9d352e7a7b4e9bdcc2f28a30ac22fa.tar.gz chromium_src-303920e6cd9d352e7a7b4e9bdcc2f28a30ac22fa.tar.bz2 | |
GN: fixes for the official build.
The C++ define OFFICIAL_BUILD wasn't getting set, and the widevine version .rc files was getting linked twice.
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
R=dpranke
TBR=ddorwin@chromium.org
Review URL: https://codereview.chromium.org/1134623003
Cr-Commit-Position: refs/heads/master@{#329308}
Diffstat (limited to 'third_party/widevine')
| -rw-r--r-- | third_party/widevine/cdm/BUILD.gn | 9 |
1 files changed, 2 insertions, 7 deletions
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", |