diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 06:36:27 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 06:36:27 +0000 |
| commit | b0eebb403ad069142ec43e566134f4000f0f0f19 (patch) | |
| tree | cc2f2a64fcf34264449031758c589055fd2072cf /chrome/chrome_installer.gypi | |
| parent | a20548491e2b97baf01fa8d103eca5c1dd8d80db (diff) | |
| download | chromium_src-b0eebb403ad069142ec43e566134f4000f0f0f19.zip chromium_src-b0eebb403ad069142ec43e566134f4000f0f0f19.tar.gz chromium_src-b0eebb403ad069142ec43e566134f4000f0f0f19.tar.bz2 | |
Revert 119841 - 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
TBR=robertshield@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9302029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119865 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_installer.gypi')
| -rw-r--r-- | chrome/chrome_installer.gypi | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi index 961c9a8..6a9cf37 100644 --- a/chrome/chrome_installer.gypi +++ b/chrome/chrome_installer.gypi @@ -14,7 +14,6 @@ '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', @@ -23,7 +22,9 @@ '<(DEPTH)', ], 'sources': [ + 'installer/gcapi/gcapi.cc', 'installer/gcapi/gcapi.def', + 'installer/gcapi/gcapi.h', ], }, { @@ -40,8 +41,6 @@ 'sources': [ 'installer/gcapi/gcapi.cc', 'installer/gcapi/gcapi.h', - 'installer/gcapi/gcapi_reactivation.cc', - 'installer/gcapi/gcapi_reactivation.h', ], }, { @@ -61,7 +60,6 @@ ], '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', |