Revert 110934 - Retry of http://codereview.chromium.org/8589029.

chrome/installer/mini_installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
     'msvs_use_common_release': 0,
     'msvs_use_common_linker_extras': 0,
   },
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   'conditions': [
     ['OS=="win"', {
       'target_defaults': {
         'dependencies': [
           '../chrome.gyp:chrome',
           '../chrome.gyp:chrome_nacl_win64',
           '../chrome.gyp:chrome_dll',
           '../chrome.gyp:default_extensions',
           '../chrome.gyp:setup',
         ],
         'include_dirs': [
           '../..',
+          '<(PRODUCT_DIR)',
           '<(INTERMEDIATE_DIR)',
           '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
         'sources': [
           'mini_installer/appid.h',
           'mini_installer/configuration.cc',
           'mini_installer/configuration.h',
           'mini_installer/decompress.cc',
           'mini_installer/decompress.h',
           'mini_installer/mini_installer.cc',
           'mini_installer/mini_installer.h',
           'mini_installer/mini_installer.ico',
           'mini_installer/mini_installer.rc',
           'mini_installer/mini_installer_exe_version.rc.version',
           'mini_installer/mini_installer_resource.h',
           'mini_installer/mini_string.cc',
           'mini_installer/mini_string.h',
           'mini_installer/pe_resource.cc',
           'mini_installer/pe_resource.h',
-          '<(INTERMEDIATE_DIR)/packed_files.rc',
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
             'EnableIntrinsicFunctions': 'true',
             'BufferSecurityCheck': 'false',
             'BasicRuntimeChecks': '0',
             'ExceptionHandling': '0',
           },
           'VCLinkerTool': {
             'RandomizedBaseAddress': '1',
@@ skipping 147 matching lines @@
                 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
                 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
                 '<(PRODUCT_DIR)/locales/en-US.pak',
                 '<(PRODUCT_DIR)/icudt.dll',
               ],
               'outputs': [
                 'xxx.out',
                 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z',
                 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z',
                 '<(PRODUCT_DIR)/setup.ex_',
-                '<(INTERMEDIATE_DIR)/packed_files.rc',
+                '<(PRODUCT_DIR)/packed_files.txt',
               ],
               'action': [
                 'python',
                 '<(create_installer_archive_py_path)',
-                '--build_dir', '<(PRODUCT_DIR)',
-                '--staging_dir', '<(INTERMEDIATE_DIR)',
-                '--input_file', '<(RULE_INPUT_PATH)',
-                '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc',
+                '--output_dir=<(PRODUCT_DIR)',
+                '--input_file=<(RULE_INPUT_PATH)',
                 # TODO(sgk):  may just use environment variables
                 #'--distribution=$(CHROMIUM_BUILD)',
                 '--distribution=_google_chrome',
                 # Optional arguments to generate diff installer
                 #'--last_chrome_installer=C:/Temp/base',
                 #'--setup_exe_format=DIFF',
                 #'--diff_algorithm=COURGETTE',
               ],
               'message': 'Create installer archive'
             },
           ],
         },
       ],
     }],
     [ 'branding == "Chrome"', {
       'variables': {
          'branding_dir': '../app/theme/google_chrome',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'branding_dir': '../app/theme/chromium',
       },
     }],
   ],
 }