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

Side by Side Diff: third_party/WebKit/Source/platform/blink_platform_tests.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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 'type': 'executable', 68 'type': 'executable',
69 'dependencies': [ 69 'dependencies': [
70 'blink_platform_test_support', 70 'blink_platform_test_support',
71 '../config.gyp:unittest_config', 71 '../config.gyp:unittest_config',
72 '../wtf/wtf.gyp:wtf', 72 '../wtf/wtf.gyp:wtf',
73 '../wtf/wtf_tests.gyp:wtf_unittest_helpers', 73 '../wtf/wtf_tests.gyp:wtf_unittest_helpers',
74 '<(DEPTH)/base/base.gyp:test_support_base', 74 '<(DEPTH)/base/base.gyp:test_support_base',
75 '<(DEPTH)/cc/cc.gyp:cc', 75 '<(DEPTH)/cc/cc.gyp:cc',
76 '<(DEPTH)/cc/cc_tests.gyp:cc_test_support', 76 '<(DEPTH)/cc/cc_tests.gyp:cc_test_support',
77 '<(DEPTH)/cc/blink/cc_blink.gyp:cc_blink', 77 '<(DEPTH)/cc/blink/cc_blink.gyp:cc_blink',
78 '<(DEPTH)/mojo/mojo_edk.gyp:mojo_common_test_support',
79 '<(DEPTH)/skia/skia.gyp:skia', 78 '<(DEPTH)/skia/skia.gyp:skia',
80 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng', 79 '<(DEPTH)/third_party/harfbuzz-ng/harfbuzz.gyp:harfbuzz-ng',
81 '<(DEPTH)/ui/gfx/gfx.gyp:gfx', 80 '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
82 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', 81 '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
83 '<(DEPTH)/url/url.gyp:url_lib', 82 '<(DEPTH)/url/url.gyp:url_lib',
84 'blink_platform.gyp:blink_platform', 83 'blink_platform.gyp:blink_platform',
85 ], 84 ],
86 'defines': [ 85 'defines': [
87 'INSIDE_BLINK', 86 'INSIDE_BLINK',
88 ], 87 ],
(...skipping 15 matching lines...) Expand all
104 ], 103 ],
105 }, 104 },
106 { 105 {
107 'target_name': 'blink_platform_test_support', 106 'target_name': 'blink_platform_test_support',
108 'type': 'static_library', 107 'type': 'static_library',
109 'dependencies': [ 108 'dependencies': [
110 '../config.gyp:config', 109 '../config.gyp:config',
111 '../wtf/wtf.gyp:wtf', 110 '../wtf/wtf.gyp:wtf',
112 'blink_platform.gyp:blink_common', 111 'blink_platform.gyp:blink_common',
113 'blink_platform.gyp:blink_platform', 112 'blink_platform.gyp:blink_platform',
114 '<(DEPTH)/device/battery/battery.gyp:device_battery_mojo_bindings',
115 '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
116 '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl',
117 '<(DEPTH)/testing/gmock.gyp:gmock', 113 '<(DEPTH)/testing/gmock.gyp:gmock',
118 ], 114 ],
119 'defines': [ 115 'defines': [
120 'INSIDE_BLINK', 116 'INSIDE_BLINK',
121 ], 117 ],
122 'include_dirs': [ 118 'include_dirs': [
123 '<(SHARED_INTERMEDIATE_DIR)/blink', 119 '<(SHARED_INTERMEDIATE_DIR)/blink',
124 ], 120 ],
125 'sources': [ 121 'sources': [
126 '<@(platform_test_support_files)', 122 '<@(platform_test_support_files)',
127 ], 123 ],
128 # Disable c4267 warnings until we fix size_t to int truncations. 124 # Disable c4267 warnings until we fix size_t to int truncations.
129 'msvs_disabled_warnings': [ 4267 ], 125 'msvs_disabled_warnings': [ 4267 ],
130 'conditions': [
131 ['OS == "android"', {
132 'dependencies': [
133 '<(DEPTH)/device/battery/battery.gyp:device_battery_java',
134 ],
135 }, { # OS != "android"
136 'dependencies': [
137 '<(DEPTH)/device/battery/battery.gyp:device_battery',
138 ],
139 }],
140 ],
141 }, 126 },
142 ], 127 ],
143 'conditions': [ 128 'conditions': [
144 ['OS=="android" and gtest_target_type == "shared_library"', { 129 ['OS=="android" and gtest_target_type == "shared_library"', {
145 'targets': [{ 130 'targets': [{
146 'target_name': 'blink_heap_unittests_apk', 131 'target_name': 'blink_heap_unittests_apk',
147 'type': 'none', 132 'type': 'none',
148 'dependencies': [ 133 'dependencies': [
149 '<(DEPTH)/base/base.gyp:base_java', 134 '<(DEPTH)/base/base.gyp:base_java',
150 '<(DEPTH)/net/net.gyp:net_java', 135 '<(DEPTH)/net/net.gyp:net_java',
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 '../../../../build/isolate.gypi', 211 '../../../../build/isolate.gypi',
227 ], 212 ],
228 'sources': [ 213 'sources': [
229 'blink_platform_unittests.isolate', 214 'blink_platform_unittests.isolate',
230 ], 215 ],
231 } 216 }
232 ], 217 ],
233 }], 218 }],
234 ], 219 ],
235 } 220 }
OLDNEW
« 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