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

Side by Side Diff: base/base.gyp

Issue 271953002: Resubmit "Add an UMA metric to track whether running on a tablet". (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove extraneous condition caused by merge. Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | base/win/win_util.h » ('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 (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 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 'NO_TCMALLOC', 148 'NO_TCMALLOC',
149 ], 149 ],
150 'direct_dependent_settings': { 150 'direct_dependent_settings': {
151 'defines': [ 151 'defines': [
152 'NO_TCMALLOC', 152 'NO_TCMALLOC',
153 ], 153 ],
154 }, 154 },
155 }], 155 }],
156 ], 156 ],
157 }], 157 }],
158 ['OS == "win"', {
159 # Specify delayload for base.dll.
160 'msvs_settings': {
161 'VCLinkerTool': {
162 'DelayLoadDLLs': [
163 'powrprof.dll',
164 ],
165 'AdditionalDependencies': [
166 'powrprof.lib',
167 ],
168 },
169 },
170 # Specify delayload for components that link with base.lib.
171 'all_dependent_settings': {
172 'msvs_settings': {
173 'VCLinkerTool': {
174 'DelayLoadDLLs': [
175 'powrprof.dll',
176 ],
177 'AdditionalDependencies': [
178 'powrprof.lib',
179 ],
180 },
181 },
182 },
183 }],
158 ['OS == "mac" or (OS == "ios" and _toolset == "host")', { 184 ['OS == "mac" or (OS == "ios" and _toolset == "host")', {
159 'link_settings': { 185 'link_settings': {
160 'libraries': [ 186 'libraries': [
161 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework', 187 '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
162 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k', 188 '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framewor k',
163 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', 189 '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
164 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', 190 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
165 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 191 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
166 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework', 192 '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
167 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 193 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
(...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 'msvs_target_platform': 'x64', 1078 'msvs_target_platform': 'x64',
1053 }, 1079 },
1054 }, 1080 },
1055 'conditions': [ 1081 'conditions': [
1056 ['component == "shared_library"', { 1082 ['component == "shared_library"', {
1057 'sources!': [ 1083 'sources!': [
1058 'debug/debug_on_start_win.cc', 1084 'debug/debug_on_start_win.cc',
1059 ], 1085 ],
1060 }], 1086 }],
1061 ], 1087 ],
1088 # Specify delayload for base_win64.dll.
1089 'msvs_settings': {
1090 'VCLinkerTool': {
1091 'DelayLoadDLLs': [
1092 'powrprof.dll',
1093 ],
1094 'AdditionalDependencies': [
1095 'powrprof.lib',
1096 ],
1097 },
1098 },
1099 # Specify delayload for components that link with base_win64.lib.
1100 'all_dependent_settings': {
1101 'msvs_settings': {
1102 'VCLinkerTool': {
1103 'DelayLoadDLLs': [
1104 'powrprof.dll',
1105 ],
1106 'AdditionalDependencies': [
1107 'powrprof.lib',
1108 ],
1109 },
1110 },
1111 },
1062 # TODO(rvargas): Bug 78117. Remove this. 1112 # TODO(rvargas): Bug 78117. Remove this.
1063 'msvs_disabled_warnings': [ 1113 'msvs_disabled_warnings': [
1064 4244, 1114 4244,
1065 4996, 1115 4996,
1066 4267, 1116 4267,
1067 ], 1117 ],
1068 'sources': [ 1118 'sources': [
1069 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc', 1119 'third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
1070 'third_party/xdg_user_dirs/xdg_user_dir_lookup.h', 1120 'third_party/xdg_user_dirs/xdg_user_dir_lookup.h',
1071 'async_socket_io_handler.h', 1121 'async_socket_io_handler.h',
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1448 'base_unittests.isolate', 1498 'base_unittests.isolate',
1449 ], 1499 ],
1450 'sources': [ 1500 'sources': [
1451 'base_unittests.isolate', 1501 'base_unittests.isolate',
1452 ], 1502 ],
1453 }, 1503 },
1454 ], 1504 ],
1455 }], 1505 }],
1456 ], 1506 ],
1457 } 1507 }
OLDNEW
« no previous file with comments | « no previous file | base/win/win_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698