diff options
| author | brettw <brettw@chromium.org> | 2015-02-25 10:46:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-25 18:48:11 +0000 |
| commit | 70d2f6ea98ae618b24a7c517570b74d20b92a7c7 (patch) | |
| tree | d9710e84119b831e80d1e41e9513a5d8c2f7dfb1 /chrome_elf | |
| parent | 830ccc4c45969c05684bb8e6919197706859d0ec (diff) | |
| download | chromium_src-70d2f6ea98ae618b24a7c517570b74d20b92a7c7.zip chromium_src-70d2f6ea98ae618b24a7c517570b74d20b92a7c7.tar.gz chromium_src-70d2f6ea98ae618b24a7c517570b74d20b92a7c7.tar.bz2 | |
Fix official build in GN
Changes process_version template. In GYP this is used in two ways and the GN version only supported one of these. This change also deletes an unnecessary fork of the template file, and fixes the dependencies for the extra files (previously they were just passed with "-f" and not added to the inputs of the target.
Adds a cdm_adapter template which basically matches the GYP version. Uses this for the media clearkey adapter and the widevine one in the official build.
Fixes for the crypto targets when compiling with the official build's checked-in sysroots.
Review URL: https://codereview.chromium.org/949233003
Cr-Commit-Position: refs/heads/master@{#318083}
Diffstat (limited to 'chrome_elf')
| -rw-r--r-- | chrome_elf/BUILD.gn | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn index 74a217f..092ba7a 100644 --- a/chrome_elf/BUILD.gn +++ b/chrome_elf/BUILD.gn @@ -6,12 +6,10 @@ import("//chrome/version.gni") import("//testing/test.gni") process_version("chrome_elf_resources") { - source = "//chrome/app/chrome_version.rc.version" - output = "$target_gen_dir/chrome_elf_version.rc" - extra_args = [ - "-f", - rebase_path("chrome_elf.ver"), + sources = [ + "chrome_elf.ver", ] + output = "$target_gen_dir/chrome_elf_version.rc" } shared_library("chrome_elf") { |