diff options
| -rw-r--r-- | chrome/browser/extensions/default_extensions/external_extensions.json (renamed from chrome/browser/extensions/external_extensions.json) | 0 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 17 | ||||
| -rwxr-xr-x | chrome/installer/mini_installer.gyp | 1 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.vcproj | 8 |
4 files changed, 18 insertions, 8 deletions
diff --git a/chrome/browser/extensions/external_extensions.json b/chrome/browser/extensions/default_extensions/external_extensions.json index 1ef50f3..1ef50f3 100644 --- a/chrome/browser/extensions/external_extensions.json +++ b/chrome/browser/extensions/default_extensions/external_extensions.json diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index c4b25a7..5533fed 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -248,6 +248,23 @@ ], }, { + 'target_name': 'default_extensions', + 'type': 'none', + 'msvs_guid': 'DA9BAB64-91DC-419B-AFDE-6FF8C569E83A', + 'conditions': [ + ['OS=="win"', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)/extensions', + 'files': [ + 'browser/extensions/default_extensions/external_extensions.json' + ] + } + ], + }], + ], + }, + { 'target_name': 'common', 'type': '<(library)', 'msvs_guid': '899F1280-3441-4D1F-BA04-CCD6208D9146', diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index aa982f4..969fe8c 100755 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -19,6 +19,7 @@ 'dependencies': [ '../chrome.gyp:chrome', '../chrome.gyp:chrome_dll', + '../chrome.gyp:default_extensions', '../../testing/gtest.gyp:gtest', 'installer.gyp:setup', ], diff --git a/chrome/installer/mini_installer/mini_installer.vcproj b/chrome/installer/mini_installer/mini_installer.vcproj index cf7f42c..abe312a 100644 --- a/chrome/installer/mini_installer/mini_installer.vcproj +++ b/chrome/installer/mini_installer/mini_installer.vcproj @@ -27,10 +27,6 @@ InheritedPropertySheets=".\mini_installer_debug.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops" > <Tool - Name="VCPreBuildEventTool" - CommandLine="IF NOT EXIST "$(OutDir)\Extensions" mkdir "$(OutDir)\Extensions" && copy /Y "$(SolutionDir)browser\extensions\external_extensions.json" "$(OutDir)\Extensions"" - /> - <Tool Name="Create Installer Archive" LastChromeInstaller="$(LAST_CHROME_INSTALLER)" SkipRebuildArchive="$(SKIP_REBUILD_CHROME_ARCHIVE)" @@ -59,10 +55,6 @@ InheritedPropertySheets=".\mini_installer_release.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops" > <Tool - Name="VCPreBuildEventTool" - CommandLine="IF NOT EXIST "$(OutDir)\Extensions" mkdir "$(OutDir)\Extensions" && copy /Y "$(SolutionDir)browser\extensions\external_extensions.json" "$(OutDir)\Extensions"" - /> - <Tool Name="Create Installer Archive" LastChromeInstaller="$(LAST_CHROME_INSTALLER)" SkipRebuildArchive="$(SKIP_REBUILD_CHROME_ARCHIVE)" |