diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-05 20:55:10 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-05 20:55:10 +0000 |
| commit | 22e790fc3e17c8236ff20b30e7eacef6e3326629 (patch) | |
| tree | 0f0dfb274401b4c28834c06b2ac7b538a7cfa853 /chrome/tools | |
| parent | 83ff91c8fffdd72650ea6298f3551c3ae4876caa (diff) | |
| download | chromium_src-22e790fc3e17c8236ff20b30e7eacef6e3326629.zip chromium_src-22e790fc3e17c8236ff20b30e7eacef6e3326629.tar.gz chromium_src-22e790fc3e17c8236ff20b30e7eacef6e3326629.tar.bz2 | |
Merge Chrome Frame file lists into common file lists.
Chrome Frame is no longer a separate build configuration, so there's no
need to support separate handling of the CF build output.
BUG=none
TEST=Buildbots still archive/process the Chrome Frame files.
Review URL: http://codereview.chromium.org/9109021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
| -rw-r--r-- | chrome/tools/build/win/FILES.cfg | 21 | ||||
| -rw-r--r-- | chrome/tools/build/win/SYMBOLS | 4 | ||||
| -rw-r--r-- | chrome/tools/build/win/TESTS | 5 |
3 files changed, 30 insertions, 0 deletions
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg index 71a2b03..ffe15b2 100644 --- a/chrome/tools/build/win/FILES.cfg +++ b/chrome/tools/build/win/FILES.cfg @@ -438,4 +438,25 @@ FILES = [ 'buildtype': ['official'], 'archive': 'syzygy/chrome.packed.7z', }, + # Chrome Frame: + { + 'filename': 'npchrome_frame.dll', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { + 'filename': 'chrome_launcher.exe', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { + 'filename': 'chrome_frame_helper.exe', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, + { + 'filename': 'chrome_frame_helper.dll', + 'arch': ['32bit', '64bit'], + 'buildtype': ['dev', 'official'], + }, ] diff --git a/chrome/tools/build/win/SYMBOLS b/chrome/tools/build/win/SYMBOLS index 1b1b9f5..b8214ed 100644 --- a/chrome/tools/build/win/SYMBOLS +++ b/chrome/tools/build/win/SYMBOLS @@ -12,3 +12,7 @@ gcp_portmon64.pdb virtual_driver_setup.pdb syzygy/chrome_dll.pdb syzygy/mini_installer.pdb +npchrome_frame.pdb +chrome_launcher.pdb +chrome_frame_helper.pdb +chrome_frame_helper_dll.pdb diff --git a/chrome/tools/build/win/TESTS b/chrome/tools/build/win/TESTS index a3028aa..9f3d90e 100644 --- a/chrome/tools/build/win/TESTS +++ b/chrome/tools/build/win/TESTS @@ -10,3 +10,8 @@ pyautolib.py _pyautolib.pyd
fonts\*
chromedriver.exe
+chrome_frame_net_tests.exe
+chrome_frame_perftests.exe
+chrome_frame_tests.exe
+chrome_frame_unittests.exe
+chrome_frame_reliability_tests.exe
|