Fix pack chrome.7z with ffmpeg component build.

Pack the ffmpeg.dll into chrome.7z when "is_component_ffmpeg" is true.

Bug:1100242

Change-Id: I9e82739b9edf38c75238f08bb0c0b160a600d926
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2269408Reviewed-by: Greg Thompson <grt@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#783916}

chrome/installer/mini_installer/BUILD.gn

@@ -7,6 +7,7 @@ import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/process_version_rc_template.gni")
 import("//components/nacl/features.gni")
+import("//third_party/ffmpeg/ffmpeg_options.gni")
 import("//third_party/icu/config.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 import("//ui/base/ui_features.gni")
@@ -192,6 +193,10 @@ template("generate_mini_installer") {
       args += [ "--component_build=1" ]
     }
 
+    if (is_component_ffmpeg) {
+      args += [ "--component_ffmpeg_build=1" ]
+    }
+
     if (skip_archive_compression) {
       args += [ "--skip_archive_compression" ]
     } else {

chrome/installer/mini_installer/chrome.release

@@ -65,6 +65,9 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\
 [HIDPI]
 chrome_200_percent.pak: %(VersionDir)s\
 
+[FFMPEG]
+ffmpeg.dll: %(VersionDir)s\
+
 [TOUCH]
 
 [GOOGLE_CHROME]

chrome/tools/build/win/create_installer_archive.py

@@ -94,7 +94,8 @@ def CompressUsingLZMA(build_dir, compressed_file, input_file, verbose):
 
 
 def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
-                             enable_hidpi, include_snapshotblob, verbose):
+                             enable_hidpi, include_snapshotblob,
+                             component_build, component_ffmpeg_build, verbose):
   """Copies the files required for installer archive.
   Copies all common files required for various distributions of Chromium and
   also files for the specific Chromium build specified by distribution.
@@ -117,6 +118,10 @@ def CopyAllFilesToStagingDir(config, distribution, staging_dir, build_dir,
     CopySectionFilesToStagingDir(config, 'SNAPSHOTBLOB', staging_dir, build_dir,
                                  verbose)
 
+  if component_build != '1' and component_ffmpeg_build == '1':
+    CopySectionFilesToStagingDir(config, 'FFMPEG', staging_dir, build_dir,
+                                 verbose)
+
 # The 'SafeConfigParser' makes all strings lowercase - which works fine on
 # a cases-insensitive NTFS partition, but makes no sense when trying to build
 # mini_installer.exe on a linux box. This function can be used to make glob
@@ -538,6 +543,8 @@ def main(options):
                            staging_dir, options.build_dir,
                            options.enable_hidpi,
                            options.include_snapshotblob,
+                           options.component_build,
+                           options.component_ffmpeg_build,
                            options.verbose)
 
   if options.component_build == '1':
@@ -603,6 +610,8 @@ def _ParseOptions():
       help='Whether to include the V8 snapshot blob.')
   parser.add_option('--component_build', default='0',
       help='Whether this archive is packaging a component build.')
+  parser.add_option('--component_ffmpeg_build', default='0',
+      help='Whether this archive is packaging with ffmpeg component build.')
   parser.add_option('--skip_archive_compression',
       action='store_true', default=False,
       help='This will turn off compression of chrome.7z into chrome.packed.7z '