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

Side by Side Diff: chrome/app_installer/app_installer.gypi

Issue 1101323003: Work on Windows GN tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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 unified diff | Download patch
« no previous file with comments | « chrome/app_installer/BUILD.gn ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['OS=="win"', { 7 ['OS=="win"', {
8 'targets': [ 8 'targets': [
9 { 9 {
10 # GN version: //chrome/app_installer:util
10 'target_name': 'app_installer_util', 11 'target_name': 'app_installer_util',
11 'type': 'static_library', 12 'type': 'static_library',
12 'dependencies': [ 13 'dependencies': [
13 'common', 14 'common',
14 'installer_util', 15 'installer_util',
15 'installer_util_strings', 16 'installer_util_strings',
16 'launcher_support', 17 'launcher_support',
17 'common_constants.gyp:common_constants', 18 'common_constants.gyp:common_constants',
18 '../base/base.gyp:base', 19 '../base/base.gyp:base',
19 '../content/content.gyp:content_common', 20 '../content/content.gyp:content_common',
20 '../net/net.gyp:net', 21 '../net/net.gyp:net',
21 '../third_party/omaha/omaha.gyp:omaha_extractor', 22 '../third_party/omaha/omaha.gyp:omaha_extractor',
22 ], 23 ],
23 'include_dirs': [ 24 'include_dirs': [
24 '..', 25 '..',
25 '<(INTERMEDIATE_DIR)', 26 '<(INTERMEDIATE_DIR)',
26 ], 27 ],
27 'sources': [ 28 'sources': [
28 'win/app_installer_util.cc', 29 'win/app_installer_util.cc',
29 'win/app_installer_util.h', 30 'win/app_installer_util.h',
30 ], 31 ],
31 }, 32 },
32 # TODO(jackhou): Add a version resource (using 33 # TODO(jackhou): Add a version resource (using
33 # version_resource_rules.gypi). 34 # version_resource_rules.gypi).
34 { 35 {
36 # GN version: //chrome/app_installer
35 'target_name': 'app_installer', 37 'target_name': 'app_installer',
36 'type': 'executable', 38 'type': 'executable',
37 'dependencies': [ 39 'dependencies': [
38 'app_installer_util', 40 'app_installer_util',
39 '../base/base.gyp:base', 41 '../base/base.gyp:base',
40 ], 42 ],
41 'include_dirs': [ 43 'include_dirs': [
42 '..', 44 '..',
43 '<(INTERMEDIATE_DIR)', 45 '<(INTERMEDIATE_DIR)',
44 ], 46 ],
45 'sources': [ 47 'sources': [
46 'win/app_installer_main.cc', 48 'win/app_installer_main.cc',
47 ], 49 ],
48 'msvs_settings': { 50 'msvs_settings': {
49 'VCLinkerTool': { 51 'VCLinkerTool': {
50 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 52 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
51 }, 53 },
52 'VCManifestTool': { 54 'VCManifestTool': {
53 'AdditionalManifestFiles': [ 55 'AdditionalManifestFiles': [
54 'app_installer/win/app_installer.exe.manifest', 56 'app_installer/win/app_installer.exe.manifest',
55 ], 57 ],
56 }, 58 },
57 }, 59 },
58 }, 60 },
59 { 61 {
62 # GN version: //chrome/installer/app_installer:app_installer_unittests
60 'target_name': 'app_installer_unittests', 63 'target_name': 'app_installer_unittests',
61 'type': 'executable', 64 'type': 'executable',
62 'dependencies': [ 65 'dependencies': [
63 'app_installer_util', 66 'app_installer_util',
64 '../base/base.gyp:base', 67 '../base/base.gyp:base',
65 '../base/base.gyp:run_all_unittests', 68 '../base/base.gyp:run_all_unittests',
66 '../net/net.gyp:net_test_support', 69 '../net/net.gyp:net_test_support',
67 '../testing/gtest.gyp:gtest', 70 '../testing/gtest.gyp:gtest',
68 ], 71 ],
69 'include_dirs': [ 72 'include_dirs': [
70 '..', 73 '..',
71 '<(INTERMEDIATE_DIR)', 74 '<(INTERMEDIATE_DIR)',
72 ], 75 ],
73 'sources': [ 76 'sources': [
74 'win/app_installer_util_unittest.cc', 77 'win/app_installer_util_unittest.cc',
75 ], 78 ],
76 'msvs_settings': { 79 'msvs_settings': {
77 'VCManifestTool': { 80 'VCManifestTool': {
78 'AdditionalManifestFiles': [ 81 'AdditionalManifestFiles': [
79 'app_installer/win/app_installer.exe.manifest', 82 'app_installer/win/app_installer.exe.manifest',
80 ], 83 ],
81 }, 84 },
82 }, 85 },
83 }, 86 },
84 ], 87 ],
85 }], 88 }],
86 ], 89 ],
87 } 90 }
OLDNEW
« no previous file with comments | « chrome/app_installer/BUILD.gn ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698