diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 03:59:20 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 03:59:20 +0000 |
| commit | ebcb5207a92da2acf2034d4e2d9054b76b41c6d5 (patch) | |
| tree | 6d6f2244e08bf66427f9734cf35e9a29dfa6f3d8 /chrome/chrome_installer.gypi | |
| parent | 716a6125dd1633606261ba49b30408a466a6fc44 (diff) | |
| download | chromium_src-ebcb5207a92da2acf2034d4e2d9054b76b41c6d5.zip chromium_src-ebcb5207a92da2acf2034d4e2d9054b76b41c6d5.tar.gz chromium_src-ebcb5207a92da2acf2034d4e2d9054b76b41c6d5.tar.bz2 | |
Implementation of GCAPI reactivation.
Also, some cleanup in gcapi_tests such that it now only runs gtest tests by default.
BUG=111453
TEST=gcapi_tests.exe
Review URL: https://chromiumcodereview.appspot.com/9288056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 6a9cf37..961c9a8 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -14,6 +14,7 @@ 'target_name': 'gcapi_dll', 'type': 'loadable_module', 'dependencies': [ + 'gcapi_lib', 'installer_util', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/google_update/google_update.gyp:google_update', @@ -22,9 +23,7 @@ '<(DEPTH)', ], 'sources': [ - 'installer/gcapi/gcapi.cc', 'installer/gcapi/gcapi.def', - 'installer/gcapi/gcapi.h', ], }, { @@ -41,6 +40,8 @@ 'sources': [ 'installer/gcapi/gcapi.cc', 'installer/gcapi/gcapi.h', + 'installer/gcapi/gcapi_reactivation.cc', + 'installer/gcapi/gcapi_reactivation.h', ], }, { @@ -60,6 +61,7 @@ ], 'sources': [ 'installer/gcapi/gcapi_last_run_test.cc', + 'installer/gcapi/gcapi_reactivation_test.cc', 'installer/gcapi/gcapi_test.cc', 'installer/gcapi/gcapi_test.rc', 'installer/gcapi/resource.h', |