diff options
author | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 23:41:32 +0000 |
---|---|---|
committer | siggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 23:41:32 +0000 |
commit | 131e02cf82eb6ec0b2e8f6bb1b0f2f149373b33d (patch) | |
tree | e6c1d4d5073f5c653253ab1b08cc8bf777ce9b27 /ceee | |
parent | 6cfeb5d1a0897aa11ec55874c8cab254ff280413 (diff) | |
download | chromium_src-131e02cf82eb6ec0b2e8f6bb1b0f2f149373b33d.zip chromium_src-131e02cf82eb6ec0b2e8f6bb1b0f2f149373b33d.tar.gz chromium_src-131e02cf82eb6ec0b2e8f6bb1b0f2f149373b33d.tar.bz2 |
Remove now-redundant precompile headers and builders, take two.
Remove all mention of precompile files from GYP files.
BUG=none
TEST=it compiles
Review URL: http://codereview.chromium.org/5190002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66547 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
-rw-r--r-- | ceee/ie/broker/broker.gyp | 2 | ||||
-rw-r--r-- | ceee/ie/common/common.gyp | 2 | ||||
-rw-r--r-- | ceee/ie/common/precompile.cc | 6 | ||||
-rw-r--r-- | ceee/ie/common/precompile.h | 14 | ||||
-rw-r--r-- | ceee/ie/ie.gyp | 16 | ||||
-rw-r--r-- | ceee/ie/plugin/bho/bho.gyp | 2 | ||||
-rw-r--r-- | ceee/ie/plugin/scripting/scripting.gyp | 2 | ||||
-rw-r--r-- | ceee/ie/plugin/toolband/toolband.gyp | 4 | ||||
-rw-r--r-- | ceee/ie/testing/precompile.cc | 6 | ||||
-rw-r--r-- | ceee/ie/testing/precompile.h | 19 | ||||
-rw-r--r-- | ceee/testing/manual/ie_broker/call_broker/call_broker.gyp | 2 | ||||
-rw-r--r-- | ceee/testing/manual/ie_broker/call_broker/precompile.cc | 6 | ||||
-rw-r--r-- | ceee/testing/manual/ie_broker/call_broker/precompile.h | 13 |
13 files changed, 6 insertions, 88 deletions
diff --git a/ceee/ie/broker/broker.gyp b/ceee/ie/broker/broker.gyp index 5e9c08a..7a2525d 100644 --- a/ceee/ie/broker/broker.gyp +++ b/ceee/ie/broker/broker.gyp @@ -89,8 +89,6 @@ 'executors_manager_docs.h', 'infobar_api_module.cc', 'infobar_api_module.h', - '../common/precompile.cc', - '../common/precompile.h', 'tab_api_module.cc', 'tab_api_module.h', 'webnavigation_api_module.cc', diff --git a/ceee/ie/common/common.gyp b/ceee/ie/common/common.gyp index df68e96..b6fb013 100644 --- a/ceee/ie/common/common.gyp +++ b/ceee/ie/common/common.gyp @@ -74,8 +74,6 @@ 'ie_util.cc', 'ie_util.h', 'mock_ie_tab_interfaces.h', - 'precompile.cc', - 'precompile.h', 'ceee_module_util.cc', 'ceee_module_util.h', diff --git a/ceee/ie/common/precompile.cc b/ceee/ie/common/precompile.cc deleted file mode 100644 index 46a23d0..0000000 --- a/ceee/ie/common/precompile.cc +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// Precompile generator file. -#include "ceee/ie/common/precompile.h" diff --git a/ceee/ie/common/precompile.h b/ceee/ie/common/precompile.h deleted file mode 100644 index 5a934ee..0000000 --- a/ceee/ie/common/precompile.h +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// Precompile header for CEEE. - -#ifndef CEEE_IE_COMMON_PRECOMPILE_H_ -#define CEEE_IE_COMMON_PRECOMPILE_H_ - -#include <atlbase.h> -#include <atlcom.h> -#include <atlstr.h> - -#endif // CEEE_IE_COMMON_PRECOMPILE_H_ diff --git a/ceee/ie/ie.gyp b/ceee/ie/ie.gyp index a70f13e..b69501b 100644 --- a/ceee/ie/ie.gyp +++ b/ceee/ie/ie.gyp @@ -64,16 +64,14 @@ 'testing/mock_broker_and_friends.h', 'testing/mock_chrome_frame_host.h', 'testing/mock_browser_and_friends.h', - 'testing/precompile.cc', - 'testing/precompile.h', ], 'configurations': { 'Debug': { 'msvs_settings': { 'VCCLCompilerTool': { - # GMock and GTest appear to be really fat, so bump - # precompile header memory setting to 332 megs. - 'AdditionalOptions': ['/Zm332', '/bigobj'], + # Many symbols generated by GMock and GTest, + # we need /bigobj to cope. + 'AdditionalOptions': ['/bigobj'], }, }, }, @@ -112,16 +110,14 @@ 'testing/mediumtest_ie_common.cc', 'testing/mediumtest_ie_common.h', 'testing/mediumtest_ie_main.cc', - 'testing/precompile.cc', - 'testing/precompile.h', ], 'configurations': { 'Debug': { 'msvs_settings': { 'VCCLCompilerTool': { - # GMock and GTest appear to be really fat, so bump - # precompile header memory setting to 332 megs. - 'AdditionalOptions': ['/Zm332'], + # Many symbols generated by GMock and GTest, + # we need /bigobj to cope. + 'AdditionalOptions': ['/bigobj'], }, }, }, diff --git a/ceee/ie/plugin/bho/bho.gyp b/ceee/ie/plugin/bho/bho.gyp index 86be95d..d6e4d9e 100644 --- a/ceee/ie/plugin/bho/bho.gyp +++ b/ceee/ie/plugin/bho/bho.gyp @@ -53,8 +53,6 @@ 'infobar_manager.h', 'infobar_window.cc', 'infobar_window.h', - '../../common/precompile.cc', - '../../common/precompile.h', 'tab_events_funnel.cc', 'tab_events_funnel.h', 'tab_window_manager.cc', diff --git a/ceee/ie/plugin/scripting/scripting.gyp b/ceee/ie/plugin/scripting/scripting.gyp index 62733bb..9f6a866 100644 --- a/ceee/ie/plugin/scripting/scripting.gyp +++ b/ceee/ie/plugin/scripting/scripting.gyp @@ -31,8 +31,6 @@ 'content_script_manager.rc', 'content_script_native_api.cc', 'content_script_native_api.h', - '../../common/precompile.cc', - '../../common/precompile.h', 'script_host.cc', 'script_host.h', 'userscripts_librarian.cc', diff --git a/ceee/ie/plugin/toolband/toolband.gyp b/ceee/ie/plugin/toolband/toolband.gyp index c75d50c..8ece483 100644 --- a/ceee/ie/plugin/toolband/toolband.gyp +++ b/ceee/ie/plugin/toolband/toolband.gyp @@ -20,8 +20,6 @@ '../../../../ceee/common/common.gyp:ceee_common', ], 'sources': [ - '../../common/precompile.cc', - '../../common/precompile.h', 'tool_band.cc', 'tool_band.h', ], @@ -52,8 +50,6 @@ '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', ], 'sources': [ - '../../common/precompile.cc', - '../../common/precompile.h', 'resource.h', 'tool_band.rgs', 'toolband.def', diff --git a/ceee/ie/testing/precompile.cc b/ceee/ie/testing/precompile.cc deleted file mode 100644 index 975a615..0000000 --- a/ceee/ie/testing/precompile.cc +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// Precompile generator file. -#include "ceee/ie/testing/precompile.h" diff --git a/ceee/ie/testing/precompile.h b/ceee/ie/testing/precompile.h deleted file mode 100644 index ef85751..0000000 --- a/ceee/ie/testing/precompile.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// Precompile header for IE CEEE unittests. - -#ifndef CEEE_IE_TESTING_PRECOMPILE_H_ -#define CEEE_IE_TESTING_PRECOMPILE_H_ - -#include <atlbase.h> -#include <atlcom.h> -#include <atlstr.h> - -#include "ceee/testing/utils/mock_com.h" -#include "ceee/testing/utils/test_utils.h" -#include "testing/gmock/include/gmock/gmock.h" -#include "testing/gtest/include/gtest/gtest.h" - -#endif // CEEE_IE_TESTING_PRECOMPILE_H_ diff --git a/ceee/testing/manual/ie_broker/call_broker/call_broker.gyp b/ceee/testing/manual/ie_broker/call_broker/call_broker.gyp index 41efd3a..96eb49c 100644 --- a/ceee/testing/manual/ie_broker/call_broker/call_broker.gyp +++ b/ceee/testing/manual/ie_broker/call_broker/call_broker.gyp @@ -12,8 +12,6 @@ 'type': 'executable', 'sources': [ 'call_broker.cc', - 'precompile.cc', - 'precompile.h', ], 'defines': [ '_CONSOLE', diff --git a/ceee/testing/manual/ie_broker/call_broker/precompile.cc b/ceee/testing/manual/ie_broker/call_broker/precompile.cc deleted file mode 100644 index 76d5c35..0000000 --- a/ceee/testing/manual/ie_broker/call_broker/precompile.cc +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// Precompile generator file. -#include "ceee/testing/manual/ie_broker/call_broker/precompile.h" diff --git a/ceee/testing/manual/ie_broker/call_broker/precompile.h b/ceee/testing/manual/ie_broker/call_broker/precompile.h deleted file mode 100644 index ca9238e..0000000 --- a/ceee/testing/manual/ie_broker/call_broker/precompile.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. -// -// Precompile header for IE broker manual test to call the broker. - -#ifndef CEEE_TESTING_MANUAL_IE_BROKER_CALL_BROKER_PRECOMPILE_H_ -#define CEEE_TESTING_MANUAL_IE_BROKER_CALL_BROKER_PRECOMPILE_H_ - -#include <stdio.h> -#include <tchar.h> - -#endif // CEEE_TESTING_MANUAL_IE_BROKER_CALL_BROKER_PRECOMPILE_H_ |