From 70d2f6ea98ae618b24a7c517570b74d20b92a7c7 Mon Sep 17 00:00:00 2001 From: brettw Date: Wed, 25 Feb 2015 10:46:53 -0800 Subject: 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} --- chrome_elf/BUILD.gn | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'chrome_elf') 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") { -- cgit v1.1