diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 03:24:23 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 03:24:23 +0000 |
| commit | cec9984d8185187145f1525522b8c58827a61330 (patch) | |
| tree | 2ba67784981ec856b130e6ab5d3e0c28b10159b5 /google_update | |
| parent | 5bb3482de944f37ef43d2c9c391869f3b26b7480 (diff) | |
| download | chromium_src-cec9984d8185187145f1525522b8c58827a61330.zip chromium_src-cec9984d8185187145f1525522b8c58827a61330.tar.gz chromium_src-cec9984d8185187145f1525522b8c58827a61330.tar.bz2 | |
Make google_update.gyp write shared files to SHARED_INTERMEDIATE_DIR
BUG=97186
Review URL: http://codereview.chromium.org/9371010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_update')
| -rw-r--r-- | google_update/google_update.gyp | 16 | ||||
| -rw-r--r-- | google_update/ondemand_updates.vcproj | 65 |
2 files changed, 10 insertions, 71 deletions
diff --git a/google_update/google_update.gyp b/google_update/google_update.gyp index da262a4..20fcbb6 100644 --- a/google_update/google_update.gyp +++ b/google_update/google_update.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2009 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 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. @@ -6,16 +6,20 @@ 'targets': [ { 'target_name': 'google_update', - 'type': 'none', + 'type': 'static_library', 'sources': [ 'google_update_idl.idl', - '<(INTERMEDIATE_DIR)/google_update_idl_i.c', - '<(INTERMEDIATE_DIR)/google_update_idl_p.c', + '<(SHARED_INTERMEDIATE_DIR)/google_update/google_update_idl.h', + '<(SHARED_INTERMEDIATE_DIR)/google_update/google_update_idl_i.c', ], + 'msvs_settings': { + 'VCMIDLTool': { + 'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)/google_update', + }, + }, 'direct_dependent_settings': { 'include_dirs': [ - # Bit of a hack to work around the built in vstudio rule. - '<(INTERMEDIATE_DIR)/../google_update', + '<(SHARED_INTERMEDIATE_DIR)', ], }, }, diff --git a/google_update/ondemand_updates.vcproj b/google_update/ondemand_updates.vcproj deleted file mode 100644 index d451e30..0000000 --- a/google_update/ondemand_updates.vcproj +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="ondemand_updates" - ProjectGUID="{4052059A-D72B-4183-B5C2-9D1B099E9E35}" - RootNamespace="ondemand_updates" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="10" - InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="10" - InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath=".\google_update_idl.idl" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> |