Fix the gcp_installer.exe version_info.

Bug: 899077
Change-Id: I5247aee260df04a450b485b6b55d25c2ae1fc2a6
Reviewed-on: https://chromium-review.googlesource.com/c/1300107
Commit-Queue: Roger Tawa <rogerta@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603086}

chrome/credential_provider/BUILD.gn

@@ -21,7 +21,7 @@ action("gcp_installer") {
     "//chrome/credential_provider/eventlog:gcp_eventlog_provider",
     "//chrome/credential_provider/gaiacp:gaia1_0",
     "//chrome/credential_provider/setup:gcp_setup",
-    "//third_party/lzma_sdk/Util/SfxSetup:7zS2",
+    "//chrome/credential_provider/setup:gcp_sfx",
   ]
 }
 

chrome/credential_provider/build/make_setup.py

@@ -75,7 +75,7 @@ def main():
   gcp_7z_fn = os.path.join(args.root_build_path, 'gcp.7z')
 
   sz_fn = os.path.join(args.src_path, r'third_party\lzma_sdk\7zr.exe')
-  sfx_fn = os.path.join(args.root_build_path, '7zS2.exe')
+  sfx_fn = os.path.join(args.root_build_path, 'gcp_sfx.exe')
 
   # Build the command line for updating files in the GCP 7z archive.
   cmd = [

chrome/credential_provider/setup/BUILD.gn

@@ -27,9 +27,19 @@ source_set("common") {
   ]
   deps = [
     ":version",
-    "//chrome/installer/util:with_no_strings",
     "../gaiacp:common",
+    "//chrome/installer/util:with_no_strings",
+  ]
+}
+
+# Builds a self extracting 7-zip binary using the 7-zip SFX sources but with
+# the credential provider's version resources.
+executable("gcp_sfx") {
+  deps = [
+    ":version",
+    "//third_party/lzma_sdk/Util/SfxSetup:7zS2_source",
   ]
+  configs += [ "//build/config/win:windowed" ]
 }
 
 executable("gcp_setup") {
@@ -38,11 +48,9 @@ executable("gcp_setup") {
   ]
   deps = [
     ":common",
-    "//chrome/common:version_header",
     "../eventlog:gcp_eventlog_messages",
     "../gaiacp:common",
+    "//chrome/common:version_header",
   ]
-  configs += [
-    "//build/config/win:windowed",
-  ]
+  configs += [ "//build/config/win:windowed" ]
 }

third_party/lzma_sdk/Util/SfxSetup/BUILD.gn

@@ -2,21 +2,20 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-executable("7zS2") {
+source_set("7zS2_source") {
   sources = [
     "SfxSetup.c",
     "precomp.h",
-    "resource.rc",
   ]
   defines = [
     "_LZMA_PROB32",
     "_WIN32",
   ]
-  include_dirs = [ ".", "../.." ]
-  deps = [
-    "//third_party/lzma_sdk:lzma_sdk",
+  include_dirs = [
+    ".",
+    "../..",
   ]
-  configs += [
-    "//build/config/win:windowed",
+  public_deps = [
+    "//third_party/lzma_sdk:lzma_sdk",
   ]
 }