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

chrome/installer/mini_installer.gyp

Index: chrome/installer/mini_installer.gyp
===================================================================
--- chrome/installer/mini_installer.gyp	(revision 110935)
+++ chrome/installer/mini_installer.gyp	(working copy)
@@ -22,6 +22,7 @@
         ],
         'include_dirs': [
           '../..',
+          '<(PRODUCT_DIR)',
           '<(INTERMEDIATE_DIR)',
           '<(SHARED_INTERMEDIATE_DIR)/chrome',
         ],
@@ -41,7 +42,6 @@
           'mini_installer/mini_string.h',
           'mini_installer/pe_resource.cc',
           'mini_installer/pe_resource.h',
-          '<(INTERMEDIATE_DIR)/packed_files.rc',
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
@@ -209,15 +209,13 @@
                 '<(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',