summaryrefslogtreecommitdiffstats
path: root/chrome/installer/mini_installer.gypi
diff options
context:
space:
mode:
authorerikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 14:20:26 +0000
committererikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 14:20:26 +0000
commite1501cb8728a4787b0d2b2b18ad8804ddc983534 (patch)
tree154ea96e32b09b89d401b0f2c607b738dfd6ae32 /chrome/installer/mini_installer.gypi
parente22cb252381dc82d95e02b4f2d214ec5e79b0ec7 (diff)
downloadchromium_src-e1501cb8728a4787b0d2b2b18ad8804ddc983534.zip
chromium_src-e1501cb8728a4787b0d2b2b18ad8804ddc983534.tar.gz
chromium_src-e1501cb8728a4787b0d2b2b18ad8804ddc983534.tar.bz2
Implement installation of the Chrome App Host.
The Chrome App Host is a simple exe that delegates to a Chrome Binaries installation at user or system level. If no installation is available, it will trigger an installation. The Chrome App Host prevents the Chrome Binaries from being uninstalled, except in the case of an upgrade to system-level. The Chrome App Host is implemented in this uncommitted CL: http://codereview.chromium.org/10559090/ . BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/10665002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147650 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/mini_installer.gypi')
-rw-r--r--chrome/installer/mini_installer.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index 8b5d5d0..ef92ab9 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -4,6 +4,7 @@
{
'dependencies': [
'<(chrome_dll_project)',
+ '../chrome.gyp:app_host',
'../chrome.gyp:chrome',
'../chrome.gyp:chrome_nacl_win64',
'../chrome.gyp:default_extensions',
@@ -179,6 +180,7 @@
],
'inputs': [
'<(create_installer_archive_py_path)',
+ '<(PRODUCT_DIR)/app_host.exe',
'<(PRODUCT_DIR)/chrome.exe',
'<(chrome_dll_path)',
'<(PRODUCT_DIR)/nacl64.exe',