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 11e30db61f5b84be518b46aa59cfba0deedb0681..f9f92e184bfc60736354781ae65d648d2f560245 100644 |
--- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp |
+++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp |
@@ -76,6 +76,7 @@ |
'<(DEPTH)/cc/blink/cc_blink.gyp:cc_blink', |
'<(DEPTH)/skia/skia.gyp:skia', |
'<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng', |
+ '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_common_test_support', |
'<(DEPTH)/ui/gfx/gfx.gyp:gfx', |
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', |
'<(DEPTH)/url/url.gyp:url_lib', |
@@ -109,6 +110,9 @@ |
'../config.gyp:config', |
'../wtf/wtf.gyp:wtf', |
'blink_platform.gyp:blink_platform', |
+ '<(DEPTH)/device/battery/battery.gyp:device_battery_mojo_bindings', |
+ '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium', |
+ '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl', |
], |
'defines': [ |
'INSIDE_BLINK', |
@@ -121,6 +125,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': [ |