summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/extensions/external_extensions.json2
-rw-r--r--chrome/installer/mini_installer/chrome.release1
-rw-r--r--chrome/installer/mini_installer/mini_installer.vcproj8
3 files changed, 11 insertions, 0 deletions
diff --git a/chrome/browser/extensions/external_extensions.json b/chrome/browser/extensions/external_extensions.json
new file mode 100644
index 0000000..2021042
--- /dev/null
+++ b/chrome/browser/extensions/external_extensions.json
@@ -0,0 +1,2 @@
+// This json file will contain a list of extensions that will be included
+// in the installer.
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 99a697a..8ed0408 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -39,6 +39,7 @@ locales\*.dll: %(VersionDir)s\Locales
Resources\Inspector\*.*: %(VersionDir)s\Resources\Inspector
Resources\Inspector\Images\*.*: %(VersionDir)s\Resources\Inspector\Images
servers\*.dll: %(VersionDir)s\
+Extensions\*.*: %(VersionDir)s\Extensions\
[GOOGLE_CHROME]
av*.dll: %(VersionDir)s\
diff --git a/chrome/installer/mini_installer/mini_installer.vcproj b/chrome/installer/mini_installer/mini_installer.vcproj
index abe312a..cf7f42c 100644
--- a/chrome/installer/mini_installer/mini_installer.vcproj
+++ b/chrome/installer/mini_installer/mini_installer.vcproj
@@ -27,6 +27,10 @@
InheritedPropertySheets=".\mini_installer_debug.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
>
<Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="IF NOT EXIST &quot;$(OutDir)\Extensions&quot; mkdir &quot;$(OutDir)\Extensions&quot; &amp;&amp; copy /Y &quot;$(SolutionDir)browser\extensions\external_extensions.json&quot; &quot;$(OutDir)\Extensions&quot;"
+ />
+ <Tool
Name="Create Installer Archive"
LastChromeInstaller="$(LAST_CHROME_INSTALLER)"
SkipRebuildArchive="$(SKIP_REBUILD_CHROME_ARCHIVE)"
@@ -55,6 +59,10 @@
InheritedPropertySheets=".\mini_installer_release.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
>
<Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="IF NOT EXIST &quot;$(OutDir)\Extensions&quot; mkdir &quot;$(OutDir)\Extensions&quot; &amp;&amp; copy /Y &quot;$(SolutionDir)browser\extensions\external_extensions.json&quot; &quot;$(OutDir)\Extensions&quot;"
+ />
+ <Tool
Name="Create Installer Archive"
LastChromeInstaller="$(LAST_CHROME_INSTALLER)"
SkipRebuildArchive="$(SKIP_REBUILD_CHROME_ARCHIVE)"