| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'target_defaults': { | 5 'target_defaults': { |
| 6 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 'enable_wexit_time_destructors': 1, | 8 'enable_wexit_time_destructors': 1, |
| 9 }, | 9 }, |
| 10 'include_dirs': [ | 10 'include_dirs': [ |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 '<(DEPTH)/components/components.gyp:cloud_devices_common', | 53 '<(DEPTH)/components/components.gyp:cloud_devices_common', |
| 54 '<(DEPTH)/google_apis/google_apis.gyp:google_apis', | 54 '<(DEPTH)/google_apis/google_apis.gyp:google_apis', |
| 55 '<(DEPTH)/ipc/ipc.gyp:ipc', | 55 '<(DEPTH)/ipc/ipc.gyp:ipc', |
| 56 '<(DEPTH)/net/net.gyp:net', | 56 '<(DEPTH)/net/net.gyp:net', |
| 57 '<(DEPTH)/url/url.gyp:url_lib', | 57 '<(DEPTH)/url/url.gyp:url_lib', |
| 58 'service_resources', | 58 'service_resources', |
| 59 ], | 59 ], |
| 60 'conditions': [ | 60 'conditions': [ |
| 61 ['OS=="win"', { | 61 ['OS=="win"', { |
| 62 'dependencies': [ | 62 'dependencies': [ |
| 63 '<(DEPTH)/chrome/chrome.gyp:chrome_version_header', |
| 63 '<(DEPTH)/chrome/chrome.gyp:launcher_support', | 64 '<(DEPTH)/chrome/chrome.gyp:launcher_support', |
| 64 '<(DEPTH)/chrome/common_constants.gyp:common_constants', | 65 '<(DEPTH)/chrome/common_constants.gyp:common_constants', |
| 65 '<(DEPTH)/chrome/common_constants.gyp:version_header', | |
| 66 ], | 66 ], |
| 67 }], | 67 }], |
| 68 ['OS=="win" and clang==1', { | 68 ['OS=="win" and clang==1', { |
| 69 # service_controller.h uses DECLARE_REGISTRY_APPID_RESOURCEID, which | 69 # service_controller.h uses DECLARE_REGISTRY_APPID_RESOURCEID, which |
| 70 # in msvs2013 returns string literals via a non-const pointer. So | 70 # in msvs2013 returns string literals via a non-const pointer. So |
| 71 # disable this warning for now. | 71 # disable this warning for now. |
| 72 # TODO(thakis): Remove this once we're on 2014, | 72 # TODO(thakis): Remove this once we're on 2014, |
| 73 # https://connect.microsoft.com/VisualStudio/feedback/details/806376/a
tl-hindrances-to-adopting-new-strictstrings-conformance-option-in-vs2013 | 73 # https://connect.microsoft.com/VisualStudio/feedback/details/806376/a
tl-hindrances-to-adopting-new-strictstrings-conformance-option-in-vs2013 |
| 74 'msvs_settings': { | 74 'msvs_settings': { |
| 75 'VCCLCompilerTool': { | 75 'VCCLCompilerTool': { |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 'win/service_listener.cc', | 110 'win/service_listener.cc', |
| 111 'win/service_listener.h', | 111 'win/service_listener.h', |
| 112 'win/service_utils.cc', | 112 'win/service_utils.cc', |
| 113 'win/service_utils.h', | 113 'win/service_utils.h', |
| 114 'win/setup_listener.cc', | 114 'win/setup_listener.cc', |
| 115 'win/setup_listener.h', | 115 'win/setup_listener.h', |
| 116 ], | 116 ], |
| 117 }, | 117 }, |
| 118 ], | 118 ], |
| 119 } | 119 } |
| OLD | NEW |