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

Side by Side Diff: chrome/common_constants.gyp

Issue 1630923002: Remove PRODUCT_STRING_PATH from chrome_constants.h on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@c2_rm_PSP_profile_resetter
Patch Set: merge up to r379824 Created 4 years, 9 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
OLDNEW
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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'common_constants_sources': [ 8 'common_constants_sources': [
9 'common/chrome_constants.cc', 9 'common/chrome_constants.cc',
10 'common/chrome_constants.h', 10 'common/chrome_constants.h',
11 'common/chrome_constants_util_win.cc',
12 'common/chrome_constants_util_win.h',
11 'common/chrome_features.cc', 13 'common/chrome_features.cc',
12 'common/chrome_features.h', 14 'common/chrome_features.h',
13 'common/chrome_icon_resources_win.cc', 15 'common/chrome_icon_resources_win.cc',
14 'common/chrome_icon_resources_win.h', 16 'common/chrome_icon_resources_win.h',
15 'common/chrome_paths.cc', 17 'common/chrome_paths.cc',
16 'common/chrome_paths.h', 18 'common/chrome_paths.h',
17 'common/chrome_paths_android.cc', 19 'common/chrome_paths_android.cc',
18 'common/chrome_paths_internal.h', 20 'common/chrome_paths_internal.h',
19 'common/chrome_paths_linux.cc', 21 'common/chrome_paths_linux.cc',
20 'common/chrome_paths_mac.mm', 22 'common/chrome_paths_mac.mm',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 '../components/components.gyp:bookmarks_common', 91 '../components/components.gyp:bookmarks_common',
90 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 92 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
91 ], 93 ],
92 'target_conditions': [ 94 'target_conditions': [
93 ['OS=="ios"', { 95 ['OS=="ios"', {
94 # iOS needs chrome_paths_mac, which is excluded by filename rules; 96 # iOS needs chrome_paths_mac, which is excluded by filename rules;
95 # re-add it in target_conditionals so it's after that exclusion. 97 # re-add it in target_conditionals so it's after that exclusion.
96 'sources/': [ 98 'sources/': [
97 ['include', '^common/chrome_paths_mac\\.mm$'], 99 ['include', '^common/chrome_paths_mac\\.mm$'],
98 ], 100 ],
101 },
102 'OS=="win"', {
103 'dependencies': [
104 'installer_util',
grt (UTC plus 2) 2016/03/08 15:44:47 you'll minimally need a win-specific includes sect
105 ],
99 }], 106 }],
100 ], 107 ],
101 'conditions': [ 108 'conditions': [
102 ['disable_nacl==0', { 109 ['disable_nacl==0', {
103 'dependencies': [ 110 'dependencies': [
104 '../components/nacl.gyp:nacl_switches', 111 '../components/nacl.gyp:nacl_switches',
105 ], 112 ],
106 }], 113 }],
107 ], 114 ],
108 }, 115 },
109 ], 116 ],
110 'conditions': [ 117 'conditions': [
111 ['OS=="win" and target_arch=="ia32"', { 118 ['OS=="win" and target_arch=="ia32"', {
112 'targets': [ 119 'targets': [
113 { 120 {
114 'target_name': 'common_constants_win64', 121 'target_name': 'common_constants_win64',
115 'hard_dependency': 1, # Because of transitive dep on version_header. 122 'hard_dependency': 1, # Because of transitive dep on version_header.
116 'type': 'static_library', 123 'type': 'static_library',
117 'sources': [ 124 'sources': [
118 '<@(common_constants_sources)' 125 '<@(common_constants_sources)'
119 ], 126 ],
120 'include_dirs': [ 127 'include_dirs': [
121 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc. 128 '<(SHARED_INTERMEDIATE_DIR)', # Needed by chrome_paths.cc.
122 ], 129 ],
123 'dependencies': [ 130 'dependencies': [
131 'installer_util',
124 'version_header', 132 'version_header',
125 'chrome_features.gyp:chrome_common_features', 133 'chrome_features.gyp:chrome_common_features',
126 '../base/base.gyp:base_win64', 134 '../base/base.gyp:base_win64',
127 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64', 135 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
128 '../components/nacl.gyp:nacl_switches_win64', 136 '../components/nacl.gyp:nacl_switches_win64',
129 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ', 137 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h ',
130 ], 138 ],
131 'defines': [ 139 'defines': [
132 '<@(nacl_win64_defines)', 140 '<@(nacl_win64_defines)',
133 'COMPILE_CONTENT_STATICALLY', 141 'COMPILE_CONTENT_STATICALLY',
134 ], 142 ],
135 'configurations': { 143 'configurations': {
136 'Common_Base': { 144 'Common_Base': {
137 'msvs_target_platform': 'x64', 145 'msvs_target_platform': 'x64',
138 }, 146 },
139 }, 147 },
140 }, 148 },
141 ], 149 ],
142 }], 150 }],
143 ], 151 ],
144 } 152 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698