Revert of gn: Generalize process_version() and move it to build/util (patchset...

Revert of gn: Generalize process_version() and move it to build/util (patchset #4 id:60001 of https://codereview.chromium.org/2308313003/ )

Reason for revert:
This appears to cause compile errors on
"Google Chrome Linux x64", closing the main waterfall.

https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/13577

FAILED: installer/version.txt
python ../../build/util/version.py --official -f ../../chrome/VERSION -f ../../chrome/app/theme/google_chrome/BRANDING -o installer/version.txt
Traceback (most recent call last):
  File "../../build/util/version.py", line 170, in <module>
    sys.exit(main())
  File "../../build/util/version.py", line 159, in main
    """ % values
KeyError: 'LASTCHANGE'

Original issue's description:
> There is nothing really chrome-specific in the process_version()
> template, and if we stop always passing some files in chrome/ on every
> invocation it is possible to generalize it and move it to build/util
> instead (and fix some layering violation comments along the way).
>
> Compared to its previous incarnation, process_version() no longer passes
> LASTCHANGE, BRANDING and VERSION automatically to version.py. This makes
> it easier for callers to specify their own |sources| with values that
> may override those set in those 3 files.
>
> A new wrapper, process_version_rc_template(), was introduced to cater
> for callers (generally Windows ones) who need to process a .rc.version
> file that requires the values from LASTCHANGE, BRANDING and VERSION. It
> always passes those 3 files to process_version() before any optional
> additional |sources|, and |template_file| defaults to
> chrome_version.rc.version.
> Since this template depends on files from //chrome, it lives in the
> newly-added //chrome/process_version_rc_template.gni.
>
> R=dpranke@chromium.org,brettw@chromium.org
>
> Committed: https://crrev.com/cf276fc41653b2830a5ec796d4db09b199754677
> Cr-Commit-Position: refs/heads/master@{#418514}

TBR=phajdan.jr@chromium.org,brettw@chromium.org,ddorwin@chromium.org,dpranke@chromium.org,xhwang@chromium.org,raphael.kubo.da.costa@intel.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review-Url: https://codereview.chromium.org/2338093003
Cr-Commit-Position: refs/heads/master@{#418519}

android_webview/common/BUILD.gn

@@ -2,12 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/util/process_version.gni")
+import("//chrome/version.gni")
 
 process_version("version") {
-  sources = [
-    "//chrome/VERSION",
-  ]
   template_file = "aw_version_info_values.h.version"
   output = "$root_gen_dir/android_webview/common/aw_version_info_values.h"
 }

blimp/common/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/util/process_version.gni")
+import("//chrome/version.gni")
 import("//testing/test.gni")
 
 component("common") {
@@ -82,9 +82,6 @@ source_set("unit_tests") {
 }
 
 process_version("protocol_version") {
-  sources = [
-    "//chrome/VERSION",
-  ]
   template_file = "protocol_version.h.version"
   output = "$target_gen_dir/protocol_version.h"
 }

build/util/version.gni

@@ -6,7 +6,7 @@
 #
 # PREFER NOT TO USE THESE. The GYP build uses this kind of thing extensively.
 # However, it is far better to write an action (or use the process_version
-# wrapper in build/util/version.gni) to generate a file at build-time with the
+# wrapper in chrome/version.gni) to generate a file at build-time with the
 # information you need. This allows better dependency checking and GN will
 # run faster.
 #

chrome/BUILD.gn

@@ -13,7 +13,7 @@ import("//build/config/win/console_app.gni")
 import("//build/config/win/manifest.gni")
 import("//chrome/chrome_repack_locales.gni")
 import("//chrome/common/features.gni")
-import("//chrome/process_version_rc_template.gni")
+import("//chrome/version.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
@@ -1212,14 +1212,16 @@ group("child_dependencies") {
 }
 
 if (is_win) {
-  process_version_rc_template("chrome_exe_version") {
+  process_version("chrome_exe_version") {
+    template_file = chrome_version_rc_template
     sources = [
       "app/chrome_exe.ver",
     ]
     output = "$target_gen_dir/chrome_exe_version.rc"
   }
 
-  process_version_rc_template("chrome_dll_version") {
+  process_version("chrome_dll_version") {
+    template_file = chrome_version_rc_template
     sources = [
       "app/chrome_dll.ver",
     ]
@@ -1235,14 +1237,16 @@ if (is_win) {
     type = "dll"
   }
 
-  process_version_rc_template("nacl64_exe_version") {
+  process_version("nacl64_exe_version") {
+    template_file = chrome_version_rc_template
     sources = [
       "app/nacl64_exe.ver",
     ]
     output = "$target_gen_dir/nacl64_exe_version.rc"
   }
 
-  process_version_rc_template("other_version") {
+  process_version("other_version") {
+    template_file = chrome_version_rc_template
     sources = [
       "app/other.ver",
     ]

chrome/android/BUILD.gn

@@ -4,11 +4,10 @@
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
-import("//build/util/process_version.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/common/features.gni")
-import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
+import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
@@ -378,10 +377,6 @@ chrome_version_java_dir = "$root_gen_dir/templates/chrome_version_java"
 chrome_version_java_file = "$chrome_version_java_dir/org/chromium/chrome/browser/ChromeVersionConstants.java"
 process_version("chrome_version_java") {
   template_file = "java/ChromeVersionConstants.java.version"
-  sources = [
-    "//chrome/VERSION",
-    branding_file_path,
-  ]
   output = chrome_version_java_file
   extra_args = [
     "-e",

chrome/app/version_assembly/BUILD.gn

@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/win/manifest.gni")
-import("//build/util/process_version.gni")
 import("//build/util/version.gni")
+import("//chrome/version.gni")
 
 version_assembly_output_file = "$target_gen_dir/version_assembly.manifest"
 
@@ -12,9 +12,6 @@ version_assembly_output_file = "$target_gen_dir/version_assembly.manifest"
 process_version("chrome_exe_version_manifest") {
   visibility = [ ":*" ]
   template_file = "chrome_exe_manifest.template"
-  sources = [
-    "//chrome/VERSION",
-  ]
   output = version_assembly_output_file
 }
 
@@ -39,9 +36,6 @@ windows_manifest("chrome_exe_manifest") {
 # directory where Chrome finds chrome.dll.
 process_version("version_assembly_manifest") {
   template_file = "version_assembly_manifest.template"
-  sources = [
-    "//chrome/VERSION",
-  ]
   output = "$root_build_dir/$chrome_version_full.manifest"
   process_only = true
 }

chrome/chrome_watcher/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//chrome/process_version_rc_template.gni")
+import("//chrome/version.gni")
 import("//testing/test.gni")
 
 source_set("client") {
@@ -47,7 +47,8 @@ group("kasko_util") {
   ]
 }
 
-process_version_rc_template("chrome_watcher_resources") {
+process_version("chrome_watcher_resources") {
+  template_file = chrome_version_rc_template
   sources = [
     "chrome_watcher.ver",
   ]

chrome/common/BUILD.gn

@@ -3,9 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/buildflag_header.gni")
-import("//build/util/process_version.gni")
 import("//chrome/common/features.gni")
-import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
+import("//chrome/version.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ -510,11 +509,8 @@ process_version("version_header") {
   # currently depends on this.
   #visibility = [ ":*" ]
 
-  sources = [
-    "//build/util/LASTCHANGE",
-    "//chrome/VERSION",
-    branding_file_path,
-  ]
+  # This one just uses the custom template and no separate sources.
+  sources = []
   template_file = "chrome_version.h.in"
 
   output = "$target_gen_dir/chrome_version.h"

chrome/installer/gcapi/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//chrome/process_version_rc_template.gni")
+import("//chrome/version.gni")
 import("//testing/test.gni")
 
 assert(is_win)
@@ -34,7 +34,7 @@ copy("copy_gcapi_header") {
   ]
 }
 
-process_version_rc_template("gcapi_dll_version") {
+process_version("gcapi_dll_version") {
   template_file = "gcapi_dll_version.rc.version"
   output = "$target_gen_dir/gcapi_dll_version.rc"
 }

chrome/installer/linux/BUILD.gn

@@ -5,9 +5,8 @@
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
 import("//build/config/sanitizers/sanitizers.gni")
-import("//build/util/process_version.gni")
 import("//build/util/version.gni")
-import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
+import("//chrome/version.gni")
 
 if (current_cpu == "x86" || current_cpu == "x64") {
   import("//media/cdm/ppapi/cdm_paths.gni")
@@ -151,10 +150,6 @@ if (!is_chromeos) {
 process_version("save_build_info") {
   # Just output the default version info variables (no template).
   process_only = true
-  sources = [
-    "//chrome/VERSION",
-    branding_file_path,
-  ]
   output = "$root_out_dir/installer/version.txt"
 }
 

chrome/installer/mini_installer/BUILD.gn

@@ -6,8 +6,8 @@ import("//build/config/compiler/compiler.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/visual_studio_version.gni")
-import("//chrome/process_version_rc_template.gni")
 import("//chrome/test/mini_installer/mini_installer_test.gni")
+import("//chrome/version.gni")
 import("//third_party/icu/config.gni")
 import("//ui/base/ui_features.gni")
 import("//v8/gni/v8.gni")
@@ -51,7 +51,7 @@ source_set("lib") {
   inputs = mini_installer_test_files
 }
 
-process_version_rc_template("version") {
+process_version("version") {
   template_file = "mini_installer_exe_version.rc.version"
   output = "$root_out_dir/mini_installer_exe_version.rc"
 }

chrome/installer/setup/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//chrome/process_version_rc_template.gni")
+import("//chrome/version.gni")
 import("//testing/test.gni")
 
 if (is_win) {
@@ -78,7 +78,7 @@ if (is_win) {
     ]
   }
 
-  process_version_rc_template("setup_exe_version") {
+  process_version("setup_exe_version") {
     template_file = "setup_exe_version.rc.version"
     output = "$target_gen_dir/setup_exe_version.rc"
   }

chrome/process_version_rc_template.gni

-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//build/config/chrome_build.gni")
-import("//build/util/process_version.gni")
-
-# The path to the BRANDING file in chrome/app/theme.
-branding_file_path = "//chrome/app/theme/$branding_path_component/BRANDING"
-
-# This is a wrapper around process_version() that eases the task of processing
-# a .rc.version file (used especially on Windows).
-#
-# This template automatically includes VERSION, LASTCHANGE and BRANDING, and
-# any additional source files are passed after those (so their values can
-# override the ones specified by those 3 files).
-#
-# Parameters:
-#   sources (optional):
-#     List of files with value definitions that will be passed in addition to
-#     VERSION, LASTCHANGE and BRANDING.
-#
-#   template_file (optional):
-#     Template file to use (not a list). If not specified, a default value,
-#     //chrome/app/chrome_version.rc.version will be used.
-#
-# This template forwards all other parameters directly to process_version().
-#
-# Examples:
-#   process_version_rc_template("my_exe_version") {
-#     output = "$target_gen_dir/my_exe_version.rc"
-#     sources = [ "frob/my_exe.ver" ]
-#     extra_args = [ "-e", "FOO=42" ]
-#   }
-#
-#   process_version_rc_template("my_dll_version") {
-#     output = "$target_gen_dir/my_dll_version.rc"
-#     template_file = [ "//foo/bar/my_dll_version.rc.version" ]
-#   }
-template("process_version_rc_template") {
-  if (defined(invoker.template_file)) {
-    _template_file = invoker.template_file
-  } else {
-    _template_file = "//chrome/app/chrome_version.rc.version"
-  }
-  _sources = [
-    "//build/util/LASTCHANGE",
-    "//chrome/VERSION",
-    branding_file_path,
-  ]
-  if (defined(invoker.sources)) {
-    _sources += invoker.sources
-  }
-
-  process_version(target_name) {
-    template_file = _template_file
-    sources = _sources
-    forward_variables_from(invoker,
-                           "*",
-                           [
-                             "sources",
-                             "template_file",
-                           ])
-  }
-}

build/util/process_version.gni → chrome/version.gni

@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chrome_build.gni")
+
 # Runs the version processing script over the given template file to produce
 # an output file. This is used for generating various forms of files that
 # incorporate the product name and version.
@@ -9,6 +11,12 @@
 # Unlike GYP, this will actually compile the resulting file, so you don't need
 # to add it separately to the sources, just depend on the target.
 #
+# This template automatically includes VERSION, LASTCHANGE, and BRANDING. It
+# automatically uses the template file .
+# GYP parameterizes this template file but all current invocations use this
+# same one. If in the future we need to set it, this should be added as an
+# optional argument.
+#
 # In GYP this is a rule that runs once per ".ver" file. In GN this just
 # processes one file per invocation of the template so you may have to have
 # multiple targets.
@@ -17,7 +25,6 @@
 #   sources (optional):
 #     List of file names to read. When converting a GYP target, this should
 #     list the 'source' (see above) as well as any extra_variable_files.
-#     The files will be passed to version.py in the order specified here.
 #
 #   output:
 #     File name of file to write. In GYP this is unspecified and it will
@@ -26,7 +33,8 @@
 #
 #   template_file (optional):
 #     Template file to use (not a list). Most Windows uses for generating
-#     resources will want to use process_version_rc_template() instead.
+#     resources will want to specify the chrome_version_rc_template defined
+#     below.
 #
 #   extra_args (optional):
 #     Extra arguments to pass to version.py. Any "-f <filename>" args should
@@ -41,12 +49,10 @@
 #
 # Example:
 #   process_version("myversion") {
-#     sources = [
-#       "//chrome/VERSION"
-#       "myfile.h.in"
-#     ]
+#     sources = [ "myfile.h.in" ]
 #     output = "$target_gen_dir/myfile.h"
-#     extra_args = [ "-e", "FOO=42" ]
+#     extra_args = ["-e", "FOO=42"]
+#     extra_files = [ "foo/BRANDING" ]
 #   }
 template("process_version") {
   assert(defined(invoker.output), "Output must be defined for $target_name")
@@ -63,7 +69,19 @@ template("process_version") {
   action(action_name) {
     script = "//build/util/version.py"
 
-    inputs = []
+    lastchange_path = "//build/util/LASTCHANGE"
+    version_path = "//chrome/VERSION"
+    if (is_chrome_branded) {
+      branding_path = "//chrome/app/theme/google_chrome/BRANDING"
+    } else {
+      branding_path = "//chrome/app/theme/chromium/BRANDING"
+    }
+
+    inputs = [
+      version_path,
+      lastchange_path,
+      branding_path,
+    ]
     if (defined(invoker.inputs)) {
       inputs += invoker.inputs
     }
@@ -91,6 +109,14 @@ template("process_version") {
       }
     }
 
+    args += [
+      "-f",
+      rebase_path(version_path, root_build_dir),
+      "-f",
+      rebase_path(branding_path, root_build_dir),
+      "-f",
+      rebase_path(lastchange_path, root_build_dir),
+    ]
     if (defined(invoker.extra_args)) {
       args += invoker.extra_args
     }
@@ -123,3 +149,5 @@ template("process_version") {
     }
   }
 }
+
+chrome_version_rc_template = "//chrome/app/chrome_version.rc.version"

chrome_elf/BUILD.gn

@@ -6,14 +6,15 @@
 # Please don't add dependencies on any other system libraries.
 
 import("//build/config/win/manifest.gni")
-import("//chrome/process_version_rc_template.gni")
+import("//chrome/version.gni")
 import("//testing/test.gni")
 
 ##------------------------------------------------------------------------------
 ## chrome_elf
 ##------------------------------------------------------------------------------
 
-process_version_rc_template("chrome_elf_resources") {
+process_version("chrome_elf_resources") {
+  template_file = chrome_version_rc_template
   sources = [
     "chrome_elf.ver",
   ]

chromecast/base/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/util/process_version.gni")
+import("//chrome/version.gni")  # TODO layering violation!
 import("//chromecast/chromecast.gni")
 import("//testing/test.gni")
 
@@ -200,9 +200,6 @@ process_version("cast_version") {
   template_file = "version.h.in"
   output = "$target_gen_dir/version.h"
 
-  sources = [
-    "//chrome/VERSION",
-  ]
   extra_args = [
     "-e",
     "VERSION_FULL=\"%s.%s.%s.%s\"%(MAJOR,MINOR,BUILD,PATCH)",

chromecast/crypto/BUILD.gn

@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//chrome/version.gni")  # TODO layering violation!
 import("//testing/test.gni")
 
 source_set("crypto") {

components/cronet/android/BUILD.gn

@@ -5,8 +5,8 @@
 import("//build/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
-import("//build/util/process_version.gni")
 import("//build/util/version.gni")
+import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("//url/features.gni")
@@ -95,10 +95,6 @@ _generated_api_version_java =
 
 process_version("cronet_api_version_java") {
   template_file = "api/src/org/chromium/net/ApiVersion.template"
-  sources = [
-    "//build/util/LASTCHANGE",
-    "//chrome/VERSION",
-  ]
   output = _generated_api_version_java
 }
 
@@ -120,10 +116,6 @@ _generated_impl_version_java =
 
 process_version("cronet_impl_version_java") {
   template_file = "java/src/org/chromium/net/impl/ImplVersion.template"
-  sources = [
-    "//build/util/LASTCHANGE",
-    "//chrome/VERSION",
-  ]
   output = _generated_impl_version_java
 }
 

components/cronet/ios/BUILD.gn

@@ -6,8 +6,8 @@ import("//build/buildflag_header.gni")
 import("//build/config/ios/rules.gni")
 import("//build/config/mac/symbols.gni")
 import("//build/mac/tweak_info_plist.gni")
-import("//build/util/process_version.gni")
 import("//build/util/version.gni")
+import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//url/features.gni")
 
@@ -19,9 +19,6 @@ declare_args() {
 
 process_version("cronet_version_header") {
   template_file = "//components/cronet/version.h.in"
-  sources = [
-    "//chrome/VERSION",
-  ]
   output = "$target_gen_dir/version.h"
   extra_args = [
     "-e",

components/data_reduction_proxy/core/common/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/util/process_version.gni")
+import("//chrome/version.gni")
 
 # Variables:
 #   deps: Extra dependencies.
@@ -109,9 +109,6 @@ source_set("unit_tests") {
 
 process_version("version_header") {
   template_file = "version.h.in"
-  sources = [
-    "//chrome/VERSION",
-  ]
   output = "$target_gen_dir/version.h"
   extra_args = [
     "-e",

components/version_info/BUILD.gn

@@ -3,8 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
-import("//build/util/process_version.gni")
-import("//chrome/process_version_rc_template.gni")  # For branding_file_path.
+import("//chrome/version.gni")
 
 declare_args() {
   use_unofficial_version_number = !is_chrome_branded
@@ -30,10 +29,5 @@ static_library("version_info") {
 
 process_version("generate_version_info") {
   template_file = "version_info_values.h.version"
-  sources = [
-    "//build/util/LASTCHANGE",
-    "//chrome/VERSION",
-    branding_file_path,
-  ]
   output = "$target_gen_dir/version_info_values.h"
 }

extensions/shell/BUILD.gn

@@ -4,7 +4,11 @@
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//build/util/process_version.gni")
+
+# Technically, this directory should not depend on files from src/chrome, but
+# that's where the VERSION file is. This  should probably all be moved to
+# src/build.
+import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ -276,10 +280,6 @@ test("app_shell_unittests") {
 
 process_version("version_header") {
   template_file = "common/version.h.in"
-  sources = [
-    "//build/util/LASTCHANGE",
-    "//chrome/VERSION",
-  ]
   output = "$target_gen_dir/common/version.h"
 }
 

ios/crnet/BUILD.gn

@@ -7,6 +7,7 @@ import("//build/config/ios/rules.gni")
 import("//build/config/mac/symbols.gni")
 import("//build/mac/tweak_info_plist.gni")
 import("//build/util/version.gni")
+import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//url/features.gni")
 

media/cdm/ppapi/BUILD.gn

@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
-import("//chrome/process_version_rc_template.gni")
+import("//chrome/version.gni")  # TODO layering violation!
 import("//media/cdm/ppapi/cdm_paths.gni")
 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni")
 import("//media/media_options.gni")
@@ -50,8 +50,9 @@ shared_library("clearkeycdm") {
   }
 }
 
-process_version_rc_template("clearkeycdmadapter_resources") {
+process_version("clearkeycdmadapter_resources") {
   visibility = [ ":*" ]
+  template_file = chrome_version_rc_template
   sources = [
     "//media/clearkeycdmadapter.ver",
     "external_clear_key/BRANDING",

remoting/build/config/remoting_build.gni

@@ -5,6 +5,7 @@
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/util/version.gni")
+import("//chrome/version.gni")
 import("//remoting/remoting_enable.gni")
 import("//remoting/remoting_locales.gni")
 import("//remoting/remoting_options.gni")

remoting/host/BUILD.gn

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/util/process_version.gni")
 import("//remoting/build/config/remoting_build.gni")
 
 process_version("remoting_version") {
@@ -965,6 +964,8 @@ if (is_win) {
       "win/version.rc.jinja2",
     ]
 
+    # TODO(zijiehe): Export lastchange_path from
+    # //chrome/version.gni:process_version
     variables = [
       rebase_path(chrome_version_file),
       rebase_path(remoting_version_file),

third_party/widevine/cdm/BUILD.gn

@@ -4,7 +4,7 @@
 
 import("//build/config/chrome_build.gni")
 import("//build/config/features.gni")
-import("//chrome/process_version_rc_template.gni")
+import("//chrome/version.gni")  # TODO layering violation
 import("//media/cdm/ppapi/cdm_paths.gni")
 import("//media/cdm/ppapi/ppapi_cdm_adapter.gni")
 import("//third_party/widevine/cdm/widevine.gni")
@@ -129,8 +129,9 @@ if (widevine_cdm_manifest_file != []) {
 
 if ((is_chrome_branded || enable_widevine) && enable_pepper_cdms) {
   # Produce and compile the .rc file.
-  process_version_rc_template("widevinecdmadapter_resources") {
+  process_version("widevinecdmadapter_resources") {
     visibility = [ ":*" ]
+    template_file = chrome_version_rc_template
     sources = [
       "BRANDING",
       "widevinecdmadapter.ver",