| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '../../chrome/tools/build/version.py', | 3 'version_py': '../../chrome/tools/build/version.py', |
| 4 'version_path': '../../chrome/VERSION', | 4 'version_path': '../../chrome/VERSION', |
| 5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', | 5 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', |
| 6 # 'branding_dir' is set in the 'conditions' section at the bottom. | 6 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 7 'msvs_use_common_release': 0, | 7 'msvs_use_common_release': 0, |
| 8 'msvs_use_common_linker_extras': 0, | 8 'msvs_use_common_linker_extras': 0, |
| 9 'mini_installer_internal_deps%': 0, | 9 'mini_installer_internal_deps%': 0, |
| 10 'mini_installer_official_deps%': 0, | 10 'mini_installer_official_deps%': 0, |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 }, | 216 }, |
| 217 }], | 217 }], |
| 218 ['component == "shared_library"', { | 218 ['component == "shared_library"', { |
| 219 'variables': { | 219 'variables': { |
| 220 'component_build_flag': '--component_build=1', | 220 'component_build_flag': '--component_build=1', |
| 221 }, | 221 }, |
| 222 }, { | 222 }, { |
| 223 'variables': { | 223 'variables': { |
| 224 'component_build_flag': '', | 224 'component_build_flag': '', |
| 225 }, | 225 }, |
| 226 'outputs': [ |
| 227 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', |
| 228 ], |
| 226 }], | 229 }], |
| 227 ['disable_nacl==1', { | 230 ['disable_nacl==1', { |
| 228 'inputs!': [ | 231 'inputs!': [ |
| 229 '<(PRODUCT_DIR)/nacl64.exe', | 232 '<(PRODUCT_DIR)/nacl64.exe', |
| 230 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 233 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
| 231 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 234 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 232 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 235 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 233 ], | 236 ], |
| 234 }], | 237 }], |
| 235 ], | 238 ], |
| 236 'inputs': [ | 239 'inputs': [ |
| 237 '<(create_installer_archive_py_path)', | 240 '<(create_installer_archive_py_path)', |
| 238 '<(PRODUCT_DIR)/app_host.exe', | 241 '<(PRODUCT_DIR)/app_host.exe', |
| 239 '<(PRODUCT_DIR)/chrome.exe', | 242 '<(PRODUCT_DIR)/chrome.exe', |
| 240 '<(PRODUCT_DIR)/chrome.dll', | 243 '<(PRODUCT_DIR)/chrome.dll', |
| 241 '<(PRODUCT_DIR)/nacl64.exe', | 244 '<(PRODUCT_DIR)/nacl64.exe', |
| 242 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', | 245 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll', |
| 243 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 246 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 244 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 247 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 245 '<(PRODUCT_DIR)/locales/en-US.pak', | 248 '<(PRODUCT_DIR)/locales/en-US.pak', |
| 246 '<(PRODUCT_DIR)/icudt.dll', | 249 '<(PRODUCT_DIR)/icudt.dll', |
| 247 ], | 250 ], |
| 248 'outputs': [ | 251 'outputs': [ |
| 252 # Also note that chrome.packed.7z is defined as an output in a |
| 253 # conditional above. |
| 249 'xxx2.out', | 254 'xxx2.out', |
| 250 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', | 255 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).7z', |
| 251 '<(PRODUCT_DIR)/<(RULE_INPUT_NAME).packed.7z', | |
| 252 '<(PRODUCT_DIR)/setup.ex_', | 256 '<(PRODUCT_DIR)/setup.ex_', |
| 253 '<(INTERMEDIATE_DIR)/packed_files.rc', | 257 '<(INTERMEDIATE_DIR)/packed_files.rc', |
| 254 ], | 258 ], |
| 255 'action': [ | 259 'action': [ |
| 256 'python', | 260 'python', |
| 257 '<(create_installer_archive_py_path)', | 261 '<(create_installer_archive_py_path)', |
| 258 '--build_dir', '<(PRODUCT_DIR)', | 262 '--build_dir', '<(PRODUCT_DIR)', |
| 259 '--staging_dir', '<(INTERMEDIATE_DIR)', | 263 '--staging_dir', '<(INTERMEDIATE_DIR)', |
| 260 '--input_file', '<(RULE_INPUT_PATH)', | 264 '--input_file', '<(RULE_INPUT_PATH)', |
| 261 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', | 265 '--resource_file_path', '<(INTERMEDIATE_DIR)/packed_files.rc', |
| (...skipping 25 matching lines...) Expand all Loading... |
| 287 'variables': { | 291 'variables': { |
| 288 'branding_dir': '../app/theme/google_chrome', | 292 'branding_dir': '../app/theme/google_chrome', |
| 289 }, | 293 }, |
| 290 }, { # else branding!="Chrome" | 294 }, { # else branding!="Chrome" |
| 291 'variables': { | 295 'variables': { |
| 292 'branding_dir': '../app/theme/chromium', | 296 'branding_dir': '../app/theme/chromium', |
| 293 }, | 297 }, |
| 294 }], | 298 }], |
| 295 ], | 299 ], |
| 296 } | 300 } |
| OLD | NEW |