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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/win/win_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 85f0a947db2bcb793628cd8f6d286e95bb6ba26f..c56fb88b125f13a042bcb512b08ce730bdf0856d 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -155,6 +155,32 @@
}],
],
}],
+ ['OS == "win"', {
+ # Specify delayload for base.dll.
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ 'powrprof.dll',
+ ],
+ 'AdditionalDependencies': [
+ 'powrprof.lib',
+ ],
+ },
+ },
+ # Specify delayload for components that link with base.lib.
+ 'all_dependent_settings': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ 'powrprof.dll',
+ ],
+ 'AdditionalDependencies': [
+ 'powrprof.lib',
+ ],
+ },
+ },
+ },
+ }],
['OS == "mac" or (OS == "ios" and _toolset == "host")', {
'link_settings': {
'libraries': [
@@ -1059,6 +1085,30 @@
],
}],
],
+ # Specify delayload for base_win64.dll.
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ 'powrprof.dll',
+ ],
+ 'AdditionalDependencies': [
+ 'powrprof.lib',
+ ],
+ },
+ },
+ # Specify delayload for components that link with base_win64.lib.
+ 'all_dependent_settings': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ 'powrprof.dll',
+ ],
+ 'AdditionalDependencies': [
+ 'powrprof.lib',
+ ],
+ },
+ },
+ },
# TODO(rvargas): Bug 78117. Remove this.
'msvs_disabled_warnings': [
4244,
« 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