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

Unified Diff: cloud_print/virtual_driver/virtual_driver.gyp

Issue 6930019: Added resources. (Closed)
Patch Set: Dealing with git stupidity Created 9 years, 7 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 | « no previous file | cloud_print/virtual_driver/win/install/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cloud_print/virtual_driver/virtual_driver.gyp
diff --git a/cloud_print/virtual_driver/virtual_driver.gyp b/cloud_print/virtual_driver/virtual_driver.gyp
index dab48b9e5d5dbe209957cf39e746f3da014f6ea1..679b9260ca328d106e1aa3f2fba2f3de813e4fc4 100644
--- a/cloud_print/virtual_driver/virtual_driver.gyp
+++ b/cloud_print/virtual_driver/virtual_driver.gyp
@@ -1,106 +1,17 @@
# Copyright (c) 2011 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.
-# TODO(abodenha@chromium.org) Consider splitting port monitor stuff into
-# its own file.
{
- 'includes': [
- '../../build/common.gypi',
- ],
- 'target_defaults': {
- 'variables': {
- 'chromium_code': 1,
- 'version_py_path': '../../chrome/tools/build/version.py',
- 'version_path': 'VERSION',
- },
- 'include_dirs': [
- '../..',
- ],
- 'libraries': [
- 'userenv.lib',
- ],
- 'sources': [
- 'win/virtual_driver_helpers.h',
- 'win/virtual_driver_helpers.cc',
- 'win/virtual_driver_consts.h',
- 'win/virtual_driver_consts.cc',
- ],
- },
- 'conditions': [
- ['OS=="win"', {
- 'targets' : [
- {
- 'target_name': 'gcp_portmon',
- 'type': 'loadable_module',
- 'dependencies': [
- '../../base/base.gyp:base',
- ],
- 'msvs_guid': 'ED3D7186-C94E-4D8B-A8E7-B7260F638F46',
- 'sources': [
- 'win/port_monitor/port_monitor.cc',
- 'win/port_monitor/port_monitor.h',
- 'win/port_monitor/port_monitor.def',
- ],
- },
- {
- 'target_name': 'gcp_portmon64',
- 'type': 'loadable_module',
- 'defines': [
- '<@(nacl_win64_defines)',
- ],
- 'dependencies': [
- '../../base/base.gyp:base_nacl_win64',
- ],
- 'sources': [
- 'win/port_monitor/port_monitor.cc',
- 'win/port_monitor/port_monitor.h',
- 'win/port_monitor/port_monitor.def',
- ],
- 'msvs_guid': '9BB292F4-6104-495A-B415-C3E314F46D6F',
- 'configurations': {
- 'Common_Base': {
- 'msvs_target_platform': 'x64',
- },
- },
- },
- {
- 'target_name': 'virtual_driver_unittests',
- 'type': 'executable',
- 'msvs_guid': '97F82D29-58D8-4909-86C8-F2BBBCC4FEBF',
- 'dependencies': [
- '../../base/base.gyp:base',
- '../../base/base.gyp:test_support_base',
- '../../testing/gmock.gyp:gmock',
- '../../testing/gtest.gyp:gtest',
- ],
- 'sources': [
- # Infrastructure files.
- '../../base/test/run_all_unittests.cc',
- 'win/port_monitor/port_monitor.cc',
- 'win/port_monitor/port_monitor.h',
- 'win/port_monitor/port_monitor_unittest.cc'
- ],
- },
- {
- 'target_name': 'virtual_driver_setup',
- 'type': 'executable',
- 'msvs_guid': 'E1E25ACA-043D-4D6E-A06F-97126532843A',
- 'dependencies': [
- '../../base/base.gyp:base',
- ],
- 'sources': [
- 'win/install/setup.cc',
- ],
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
- },
- },
- },
- ],
+ 'targets': [
+ {
+ 'target_name': 'virtual_driver',
+ 'type': 'none',
+ 'dependencies': [
+ 'win/install/virtual_driver_install.gyp:*',
+ 'win/port_monitor/virtual_driver_port_monitor.gyp:*',
+ ],
},
],
- ]
}
# Local Variables:
« no previous file with comments | « no previous file | cloud_print/virtual_driver/win/install/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698