Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(731)

Unified Diff: net/stress_cache.scons

Issue 17327: Back out r7826, which broke the Linux build (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net_unittests.scons ('k') | net/tools/tld_cleanup/tld_cleanup.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/stress_cache.scons
===================================================================
--- net/stress_cache.scons (revision 7829)
+++ net/stress_cache.scons (working copy)
@@ -36,64 +36,19 @@
],
)
-input_files = ChromeFileList([
+input_files = [
'disk_cache/disk_cache_test_util$OBJSUFFIX',
'disk_cache/stress_cache.cc',
-])
+]
if not env.Bit('mac'):
env.ChromeTestProgram('stress_cache', input_files)
-p = env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj',
- guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}',
- dependencies = [
- '$BASE_DIR/build/base.vcproj',
- '$NET_DIR/build/net.vcproj',
- '$ICU38_DIR/build/icu.vcproj',
- '$TESTING_DIR/gtest.vcproj',
- ],
- # TODO: restore when we can derive all info,
- # on all platforms, from the windows build targets.
- #buildtargets=TODO,
- files=input_files,
- tools=[
- 'VCPreBuildEventTool',
- 'VCCustomBuildTool',
- 'VCXMLDataGeneratorTool',
- 'VCWebServiceProxyGeneratorTool',
- 'VCMIDLTool',
- 'VCCLCompilerTool',
- 'VCManagedResourceCompilerTool',
- 'VCResourceCompilerTool',
- 'VCPreLinkEventTool',
- MSVSTool('VCLinkerTool',
- SubSystem='1'),
- 'VCALinkTool',
- 'VCManifestTool',
- 'VCXDCMakeTool',
- 'VCBscMakeTool',
- 'VCFxCopTool',
- 'VCAppVerifierTool',
- 'VCWebDeploymentTool',
- 'VCPostBuildEventTool',
- ],
- ConfigurationType='1')
-
-
-p.AddConfig('Debug|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/debug.vsprops',
- ])
-
-p.AddConfig('Release|Win32',
- InheritedPropertySheets=[
- '$(SolutionDir)../build/common.vsprops',
- '$(SolutionDir)../build/release.vsprops',
- ])
-
-env.AlwaysBuild(p)
-
-i = env.Command('$CHROME_SRC_DIR/net/build/stress_cache.vcproj', p,
- Copy('$TARGET', '$SOURCE'))
-Alias('msvs', i)
+env.ChromeMSVSProject('$NET_DIR/build/stress_cache.vcproj',
+ dependencies = [
+ '$BASE_DIR/build/base.vcproj',
+ '$NET_DIR/build/net.vcproj',
+ '$ICU38_DIR/build/icu.vcproj',
+ '$TESTING_DIR/gtest.vcproj',
+ ],
+ guid='{B491C3A1-DE5F-4843-A1BB-AB8C4337187B}')
« no previous file with comments | « net/net_unittests.scons ('k') | net/tools/tld_cleanup/tld_cleanup.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698