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

Unified Diff: third_party/WebKit/Source/platform/blink_platform_tests.gyp

Issue 1538803002: Migrates battery_status from content/renderer/ to WebKit/platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Synced. Created 4 years, 10 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
Index: third_party/WebKit/Source/platform/blink_platform_tests.gyp
diff --git a/third_party/WebKit/Source/platform/blink_platform_tests.gyp b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
index 8525966e78299a3f03ac43254fb458bb480f018f..bd453eb3bdd36f98769023f7e2f142eab695d640 100644
--- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp
+++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
@@ -75,6 +75,7 @@
'<(DEPTH)/cc/cc.gyp:cc',
'<(DEPTH)/cc/cc_tests.gyp:cc_test_support',
'<(DEPTH)/cc/blink/cc_blink.gyp:cc_blink',
+ '<(DEPTH)/mojo/mojo_edk.gyp:mojo_common_test_support',
'<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
'<(DEPTH)/ui/gfx/gfx.gyp:gfx',
@@ -110,6 +111,9 @@
'../wtf/wtf.gyp:wtf',
'blink_platform.gyp:blink_common',
'blink_platform.gyp:blink_platform',
+ '<(DEPTH)/device/battery/battery.gyp:device_battery_mojo_bindings',
+ '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
+ '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
'<(DEPTH)/testing/gmock.gyp:gmock',
],
'defines': [
@@ -123,6 +127,17 @@
],
# Disable c4267 warnings until we fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267 ],
+ 'conditions': [
+ ['OS == "android"', {
+ 'dependencies': [
+ '<(DEPTH)/device/battery/battery.gyp:device_battery_java',
+ ],
+ }, { # OS != "android"
+ 'dependencies': [
+ '<(DEPTH)/device/battery/battery.gyp:device_battery',
+ ],
+ }],
+ ],
},
],
'conditions': [
« no previous file with comments | « third_party/WebKit/Source/platform/blink_platform.gypi ('k') | third_party/WebKit/Source/platform/testing/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698