Index: chrome/installer/mini_installer.gyp |
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp |
index 4f73b983c868e1e3353eab0790dfc0507c07de45..822a085ce27daaa495a7c70282c8ac447e06be45 100644 |
--- a/chrome/installer/mini_installer.gyp |
+++ b/chrome/installer/mini_installer.gyp |
@@ -22,7 +22,6 @@ |
], |
'include_dirs': [ |
'../..', |
- '<(PRODUCT_DIR)', |
'<(INTERMEDIATE_DIR)', |
'<(SHARED_INTERMEDIATE_DIR)/chrome', |
], |
@@ -42,6 +41,7 @@ |
'mini_installer/mini_string.h', |
'mini_installer/pe_resource.cc', |
'mini_installer/pe_resource.h', |
+ '<(INTERMEDIATE_DIR)/packed_files.rc', |
], |
'msvs_settings': { |
'VCCLCompilerTool': { |
@@ -209,13 +209,15 @@ |
'<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', |
'<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', |
'<(PRODUCT_DIR)/setup.ex_', |
- '<(PRODUCT_DIR)/packed_files.txt', |
+ '<(INTERMEDIATE_DIR)/packed_files.rc', |
], |
'action': [ |
'python', |
'<(create_installer_archive_py_path)', |
- '--output_dir=<(PRODUCT_DIR)', |
- '--input_file=<(RULE_INPUT_PATH)', |
+ '--build_dir', '<(PRODUCT_DIR)', |
+ '--staging_dir', '<(INTERMEDIATE_DIR)', |
+ '--input_file', '<(RULE_INPUT_PATH)', |
+ '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', |
# TODO(sgk): may just use environment variables |
#'--distribution=$(CHROMIUM_BUILD)', |
'--distribution=_google_chrome', |