summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-22 03:06:45 +0000
committermbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-22 03:06:45 +0000
commit78d5c12df8c7e3cf0c98216eb00cd9cf0a7d83e6 (patch)
treea44b2bd5f60de3d34b881f2d0f4c108bfb94a501 /chrome
parenta9dedda00615c5ba4ba2b69c37b824eea1059eed (diff)
downloadchromium_src-78d5c12df8c7e3cf0c98216eb00cd9cf0a7d83e6.zip
chromium_src-78d5c12df8c7e3cf0c98216eb00cd9cf0a7d83e6.tar.gz
chromium_src-78d5c12df8c7e3cf0c98216eb00cd9cf0a7d83e6.tar.bz2
Revert bbot test.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/chrome_dll.vcproj5
-rw-r--r--chrome/chrome.sln12
2 files changed, 0 insertions, 17 deletions
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj
index 08f5803..fc32200 100644
--- a/chrome/app/chrome_dll.vcproj
+++ b/chrome/app/chrome_dll.vcproj
@@ -43,7 +43,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- RuntimeLibrary="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -56,10 +55,8 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib"
OutputFile="$(IntDir)\chrome.dll"
LinkIncremental="1"
- IgnoreDefaultLibraryNames="libcmt.lib"
ImportLibrary="$(OutDir)\lib\$(ProjectName).lib"
/>
<Tool
@@ -126,9 +123,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib"
OutputFile="$(OutDir)\chrome.dll"
- IgnoreDefaultLibraryNames="libcmt.lib"
ImportLibrary="$(OutDir)\lib\$(ProjectName).lib"
/>
<Tool
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 6e59a11..68ad027 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -165,7 +165,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dl
{AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6}
{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
- {C564F145-9172-42C3-BFCB-60FDEA124321} = {C564F145-9172-42C3-BFCB-60FDEA124321}
{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}
{C78D02D0-A366-4EC6-A248-AA8E64C4BA18} = {C78D02D0-A366-4EC6-A248-AA8E64C4BA18}
{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
@@ -1434,8 +1433,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "v8_nosnapshot", "..\build\t
{EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcmalloc", "..\third_party\tcmalloc\tcmalloc.vcproj", "{C564F145-9172-42C3-BFCB-60FDEA124321}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -2402,14 +2399,6 @@ Global
{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Mixed Platforms.Build.0 = Release|Win32
{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.ActiveCfg = Release|Win32
{C564F145-9172-42C3-BFCB-6014CA97DBCD}.Release|Win32.Build.0 = Release|Win32
- {C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
- {C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Mixed Platforms.Build.0 = Debug|Win32
- {C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Win32.ActiveCfg = Debug|Win32
- {C564F145-9172-42C3-BFCB-60FDEA124321}.Debug|Win32.Build.0 = Debug|Win32
- {C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Mixed Platforms.ActiveCfg = Release|Win32
- {C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Mixed Platforms.Build.0 = Release|Win32
- {C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Win32.ActiveCfg = Release|Win32
- {C564F145-9172-42C3-BFCB-60FDEA124321}.Release|Win32.Build.0 = Release|Win32
{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -2893,7 +2882,6 @@ Global
{C0C7DA58-C90D-4BDE-AE44-588997339F5D} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
- {C564F145-9172-42C3-BFCB-60FDEA124321} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E}
{C70D3509-57C4-4326-90C1-2EC0AE34848D} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
{C78D02D0-A366-4EC6-A248-AA8E64C4BA18} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}