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

Side by Side Diff: third_party/WebKit/Source/platform/blink_platform.gyp

Issue 1740843002: Revert of 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, 9 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 unified diff | Download patch
OLDNEW
1 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 'target_name': 'blink_platform', 124 'target_name': 'blink_platform',
125 'type': '<(component)', 125 'type': '<(component)',
126 'dependencies': [ 126 'dependencies': [
127 '../config.gyp:config', 127 '../config.gyp:config',
128 '../wtf/wtf.gyp:wtf', 128 '../wtf/wtf.gyp:wtf',
129 'blink_common', 129 'blink_common',
130 'blink_heap_asm_stubs', 130 'blink_heap_asm_stubs',
131 'platform_generated.gyp:make_platform_generated', 131 'platform_generated.gyp:make_platform_generated',
132 '<(DEPTH)/base/base.gyp:base', 132 '<(DEPTH)/base/base.gyp:base',
133 '<(DEPTH)/cc/cc.gyp:cc', 133 '<(DEPTH)/cc/cc.gyp:cc',
134 '<(DEPTH)/device/battery/battery.gyp:device_battery_mojo_bindings',
135 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 134 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
136 '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
137 '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
138 '<(DEPTH)/skia/skia.gyp:skia', 135 '<(DEPTH)/skia/skia.gyp:skia',
139 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', 136 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
140 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 137 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
141 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 138 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
142 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', 139 '<(DEPTH)/third_party/libpng/libpng.gyp:libpng',
143 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', 140 '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp',
144 '<(DEPTH)/third_party/ots/ots.gyp:ots', 141 '<(DEPTH)/third_party/ots/ots.gyp:ots',
145 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', 142 '<(DEPTH)/third_party/qcms/qcms.gyp:qcms',
146 '<(DEPTH)/ui/gfx/gfx.gyp:gfx', 143 '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
147 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 144 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 ['OS=="android"', { 423 ['OS=="android"', {
427 'cflags!': ['-mthumb'], 424 'cflags!': ['-mthumb'],
428 }], 425 }],
429 ], 426 ],
430 },{ # target_arch!="arm" 427 },{ # target_arch!="arm"
431 'type': 'none', 428 'type': 'none',
432 }], 429 }],
433 ], 430 ],
434 }], 431 }],
435 } 432 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/battery/battery_status.h ('k') | third_party/WebKit/Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698