diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 19:29:42 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-31 19:29:42 +0000 |
| commit | 304c82d928e0430a0c25bc7e356214045d17492e (patch) | |
| tree | 480c242015f22bae5b0e0adcaa76ba29d486b2c9 /chrome/installer/mini_installer_syzygy.gyp | |
| parent | 42db77a6a1a5066830a9111b3a5cfaad77843364 (diff) | |
| download | chromium_src-304c82d928e0430a0c25bc7e356214045d17492e.zip chromium_src-304c82d928e0430a0c25bc7e356214045d17492e.tar.gz chromium_src-304c82d928e0430a0c25bc7e356214045d17492e.tar.bz2 | |
syzygy steps for chrome_child.dll
Adds optional build steps to do syzygy steps on chrome_child.dll. gyp
refactor to make the chrome_syzygy.gyp be reusable twice.
mini_installer_syzygy fiddled a little to use a list of binaries.
TBR=chrisha@chromium.org, robertshield@chromium.org
BUG=237249
Review URL: https://chromiumcodereview.appspot.com/21093004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214802 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer_syzygy.gyp')
| -rw-r--r-- | chrome/installer/mini_installer_syzygy.gyp | 58 |
1 files changed, 44 insertions, 14 deletions
diff --git a/chrome/installer/mini_installer_syzygy.gyp b/chrome/installer/mini_installer_syzygy.gyp index 74050ab..6c99347 100644 --- a/chrome/installer/mini_installer_syzygy.gyp +++ b/chrome/installer/mini_installer_syzygy.gyp @@ -15,21 +15,51 @@ ], 'conditions': [ # This target won't build in fastbuild, since there are no PDBs. - ['OS=="win" and fastbuild==0 and chrome_multiple_dll==0', { - 'targets': [ - { - 'target_name': 'mini_installer_syzygy', - 'type': 'executable', - 'product_name': 'mini_installer', + ['OS=="win" and fastbuild==0', { + 'conditions': [ + ['chrome_multiple_dll==0', { + 'targets': [ + { + 'target_name': 'mini_installer_syzygy', + 'type': 'executable', + 'product_name': 'mini_installer', - 'variables': { - 'chrome_dll_project': '../chrome_syzygy.gyp:chrome_dll_syzygy', - 'chrome_dll_path': '<(PRODUCT_DIR)/syzygy/chrome.dll', - 'output_dir': '<(PRODUCT_DIR)/syzygy', - }, - # Bulk of the build configuration comes from here. - 'includes': [ 'mini_installer.gypi', ], - }, + 'variables': { + 'chrome_dll_project': [ + '../chrome_syzygy.gyp:chrome_dll_syzygy', + ], + 'chrome_dll_path': [ + '<(PRODUCT_DIR)/syzygy/chrome.dll', + ], + 'output_dir': '<(PRODUCT_DIR)/syzygy', + }, + # Bulk of the build configuration comes from here. + 'includes': [ 'mini_installer.gypi', ], + }, + ], + }, { + 'targets': [ + { + 'target_name': 'mini_installer_syzygy', + 'type': 'executable', + 'product_name': 'mini_installer', + + 'variables': { + 'chrome_dll_project': [ + '../chrome_syzygy.gyp:chrome_dll_syzygy', + '../chrome_syzygy.gyp:chrome_child_dll_syzygy', + ], + 'chrome_dll_path': [ + '<(PRODUCT_DIR)/syzygy/chrome.dll', + '<(PRODUCT_DIR)/syzygy/chrome_child.dll', + ], + 'output_dir': '<(PRODUCT_DIR)/syzygy', + }, + # Bulk of the build configuration comes from here. + 'includes': [ 'mini_installer.gypi', ], + }, + ], + }], ], },{ 'targets': [], |