| 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 8b87e66dcecbabe5ba472941a44e25514ed048b2..ddf062ff61aff67b4680641d45bfdad6dd5ae764 100644
|
| --- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp
|
| +++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp
|
| @@ -112,7 +112,6 @@
|
| 'blink_platform.gyp:blink_common',
|
| 'blink_platform.gyp:blink_platform',
|
| '<(DEPTH)/cc/cc.gyp:cc',
|
| - '<(DEPTH)/device/battery/battery.gyp:device_battery_mojo_bindings',
|
| '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
|
| '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings',
|
| '<(DEPTH)/testing/gmock.gyp:gmock',
|
| @@ -128,17 +127,6 @@
|
| ],
|
| # 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': [
|
|
|