| 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 'variables': { | 5 'variables': { |
| 6 'chromium_code': 1, | 6 'chromium_code': 1, |
| 7 }, | 7 }, |
| 8 'includes': [ | 8 'includes': [ |
| 9 '../../build/util/version.gypi', | 9 '../../build/util/version.gypi', |
| 10 '../../build/win_precompile.gypi', | 10 '../../build/win_precompile.gypi', |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 'delegate_execute_util.h', | 66 'delegate_execute_util.h', |
| 67 'resource.h', | 67 'resource.h', |
| 68 '<(SHARED_INTERMEDIATE_DIR)/delegate_execute/delegate_execute_exe_versio
n.rc', | 68 '<(SHARED_INTERMEDIATE_DIR)/delegate_execute/delegate_execute_exe_versio
n.rc', |
| 69 ], | 69 ], |
| 70 'msvs_settings': { | 70 'msvs_settings': { |
| 71 'VCLinkerTool': { | 71 'VCLinkerTool': { |
| 72 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 72 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 73 }, | 73 }, |
| 74 }, | 74 }, |
| 75 'conditions': [ | 75 'conditions': [ |
| 76 ['use_aura==1', { |
| 77 'dependencies': [ |
| 78 '../win8.gyp:metro_viewer_constants', |
| 79 ], |
| 80 }], |
| 76 ['branding!="Chrome"', { | 81 ['branding!="Chrome"', { |
| 77 'dependencies!': [ | 82 'dependencies!': [ |
| 78 '../../google_update/google_update.gyp:google_update', | 83 '../../google_update/google_update.gyp:google_update', |
| 79 ], | 84 ], |
| 80 }], | 85 }], |
| 81 ], | 86 ], |
| 82 }, | 87 }, |
| 83 { | 88 { |
| 84 # GN version: //win8/delegate_execute:delegate_execute_unittests | 89 # GN version: //win8/delegate_execute:delegate_execute_unittests |
| 85 'target_name': 'delegate_execute_unittests', | 90 'target_name': 'delegate_execute_unittests', |
| 86 'type': 'executable', | 91 'type': 'executable', |
| 87 'dependencies': [ | 92 'dependencies': [ |
| 88 '../../base/base.gyp:base', | 93 '../../base/base.gyp:base', |
| 89 '../../base/base.gyp:run_all_unittests', | 94 '../../base/base.gyp:run_all_unittests', |
| 90 '../../testing/gtest.gyp:gtest', | 95 '../../testing/gtest.gyp:gtest', |
| 91 ], | 96 ], |
| 92 'sources': [ | 97 'sources': [ |
| 93 'delegate_execute_util.cc', | 98 'delegate_execute_util.cc', |
| 94 'delegate_execute_util.h', | 99 'delegate_execute_util.h', |
| 95 'delegate_execute_util_unittest.cc', | 100 'delegate_execute_util_unittest.cc', |
| 96 ], | 101 ], |
| 97 }, | 102 }, |
| 98 ], | 103 ], |
| 99 } | 104 } |
| OLD | NEW |