| OLD | NEW |
| 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 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 }, | 105 }, |
| 106 { | 106 { |
| 107 'target_name': 'blink_platform_test_support', | 107 'target_name': 'blink_platform_test_support', |
| 108 'type': 'static_library', | 108 'type': 'static_library', |
| 109 'dependencies': [ | 109 'dependencies': [ |
| 110 '../config.gyp:config', | 110 '../config.gyp:config', |
| 111 '../wtf/wtf.gyp:wtf', | 111 '../wtf/wtf.gyp:wtf', |
| 112 'blink_platform.gyp:blink_common', | 112 'blink_platform.gyp:blink_common', |
| 113 'blink_platform.gyp:blink_platform', | 113 'blink_platform.gyp:blink_platform', |
| 114 '<(DEPTH)/cc/cc.gyp:cc', | 114 '<(DEPTH)/cc/cc.gyp:cc', |
| 115 '<(DEPTH)/device/battery/battery.gyp:device_battery_mojo_bindings', | |
| 116 '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl', | 115 '<(DEPTH)/mojo/mojo_edk.gyp:mojo_system_impl', |
| 117 '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings', | 116 '<(DEPTH)/mojo/mojo_public.gyp:mojo_cpp_bindings', |
| 118 '<(DEPTH)/testing/gmock.gyp:gmock', | 117 '<(DEPTH)/testing/gmock.gyp:gmock', |
| 119 ], | 118 ], |
| 120 'defines': [ | 119 'defines': [ |
| 121 'INSIDE_BLINK', | 120 'INSIDE_BLINK', |
| 122 ], | 121 ], |
| 123 'include_dirs': [ | 122 'include_dirs': [ |
| 124 '<(SHARED_INTERMEDIATE_DIR)/blink', | 123 '<(SHARED_INTERMEDIATE_DIR)/blink', |
| 125 ], | 124 ], |
| 126 'sources': [ | 125 'sources': [ |
| 127 '<@(platform_test_support_files)', | 126 '<@(platform_test_support_files)', |
| 128 ], | 127 ], |
| 129 # Disable c4267 warnings until we fix size_t to int truncations. | 128 # Disable c4267 warnings until we fix size_t to int truncations. |
| 130 'msvs_disabled_warnings': [ 4267 ], | 129 'msvs_disabled_warnings': [ 4267 ], |
| 131 'conditions': [ | |
| 132 ['OS == "android"', { | |
| 133 'dependencies': [ | |
| 134 '<(DEPTH)/device/battery/battery.gyp:device_battery_java', | |
| 135 ], | |
| 136 }, { # OS != "android" | |
| 137 'dependencies': [ | |
| 138 '<(DEPTH)/device/battery/battery.gyp:device_battery', | |
| 139 ], | |
| 140 }], | |
| 141 ], | |
| 142 }, | 130 }, |
| 143 ], | 131 ], |
| 144 'conditions': [ | 132 'conditions': [ |
| 145 ['OS=="android" and gtest_target_type == "shared_library"', { | 133 ['OS=="android" and gtest_target_type == "shared_library"', { |
| 146 'targets': [{ | 134 'targets': [{ |
| 147 'target_name': 'blink_heap_unittests_apk', | 135 'target_name': 'blink_heap_unittests_apk', |
| 148 'type': 'none', | 136 'type': 'none', |
| 149 'dependencies': [ | 137 'dependencies': [ |
| 150 '<(DEPTH)/base/base.gyp:base_java', | 138 '<(DEPTH)/base/base.gyp:base_java', |
| 151 '<(DEPTH)/net/net.gyp:net_java', | 139 '<(DEPTH)/net/net.gyp:net_java', |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 '../../../../build/isolate.gypi', | 215 '../../../../build/isolate.gypi', |
| 228 ], | 216 ], |
| 229 'sources': [ | 217 'sources': [ |
| 230 'blink_platform_unittests.isolate', | 218 'blink_platform_unittests.isolate', |
| 231 ], | 219 ], |
| 232 } | 220 } |
| 233 ], | 221 ], |
| 234 }], | 222 }], |
| 235 ], | 223 ], |
| 236 } | 224 } |
| OLD | NEW |