third_party/WebKit/Source/platform/blink_platform_tests.gyp - Issue 1538803002: Migrates battery_status from content/renderer/ to WebKit/platform/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Created 4 years, 11 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

« third_party/WebKit/Source/platform/base/Bind.h ('K') | « third_party/WebKit/Source/platform/blink_platform.gypi ('k') | third_party/WebKit/Source/platform/testing/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9bb1a8405fb970f8527bfee4a0f66cbaaa4e9b68..62e3bdcd7d1338cee021420260c917d192bfcecb 100644

--- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp

+++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp

@@ -126,6 +126,11 @@

'../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_common_test_support',

+ '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_system_impl',

+ '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',

'defines': [

'INSIDE_BLINK',

@@ -138,6 +143,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': [