| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'ppapi_tests', | 8 'target_name': 'ppapi_tests', |
| 9 'type': 'loadable_module', | 9 'type': 'loadable_module', |
| 10 'include_dirs': [ | 10 'include_dirs': [ |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 'ppapi_unittest_shared', | 119 'ppapi_unittest_shared', |
| 120 '../base/base.gyp:test_support_base', | 120 '../base/base.gyp:test_support_base', |
| 121 '../testing/gtest.gyp:gtest', | 121 '../testing/gtest.gyp:gtest', |
| 122 ], | 122 ], |
| 123 'sources': [ | 123 'sources': [ |
| 124 'proxy/ppapi_perftests.cc', | 124 'proxy/ppapi_perftests.cc', |
| 125 'proxy/ppp_messaging_proxy_perftest.cc', | 125 'proxy/ppp_messaging_proxy_perftest.cc', |
| 126 ], | 126 ], |
| 127 'conditions': [ | 127 'conditions': [ |
| 128 # See http://crbug.com/162998#c4 for why this is needed. | 128 # See http://crbug.com/162998#c4 for why this is needed. |
| 129 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 129 ['OS=="linux" and use_allocator!="none"', { |
| 130 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc
malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', { | |
| 131 'dependencies': [ | 130 'dependencies': [ |
| 132 '../base/allocator/allocator.gyp:allocator', | 131 '../base/allocator/allocator.gyp:allocator', |
| 133 ], | 132 ], |
| 134 }], | 133 }], |
| 135 ], | 134 ], |
| 136 }, | 135 }, |
| 137 { | 136 { |
| 138 'target_name': 'ppapi_unittests', | 137 'target_name': 'ppapi_unittests', |
| 139 'type': 'executable', | 138 'type': 'executable', |
| 140 'variables': { | 139 'variables': { |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 'shared_impl/resource_tracker_unittest.cc', | 183 'shared_impl/resource_tracker_unittest.cc', |
| 185 'shared_impl/thread_aware_callback_unittest.cc', | 184 'shared_impl/thread_aware_callback_unittest.cc', |
| 186 'shared_impl/time_conversion_unittest.cc', | 185 'shared_impl/time_conversion_unittest.cc', |
| 187 'shared_impl/tracked_callback_unittest.cc', | 186 'shared_impl/tracked_callback_unittest.cc', |
| 188 'shared_impl/var_tracker_unittest.cc', | 187 'shared_impl/var_tracker_unittest.cc', |
| 189 'shared_impl/var_value_conversions_unittest.cc', | 188 'shared_impl/var_value_conversions_unittest.cc', |
| 190 ], | 189 ], |
| 191 'conditions': [ | 190 'conditions': [ |
| 192 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { | 191 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { |
| 193 'conditions': [ | 192 'conditions': [ |
| 194 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 | 193 [ 'use_allocator!="none"', { |
| 195 [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or
(use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', { | |
| 196 'dependencies': [ | 194 'dependencies': [ |
| 197 '../base/allocator/allocator.gyp:allocator', | 195 '../base/allocator/allocator.gyp:allocator', |
| 198 ], | 196 ], |
| 199 }], | 197 }], |
| 200 ], | 198 ], |
| 201 }], | 199 }], |
| 202 ], | 200 ], |
| 203 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 201 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 204 'msvs_disabled_warnings': [ 4267, ], | 202 'msvs_disabled_warnings': [ 4267, ], |
| 205 }, | 203 }, |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 'lib/gl/include', | 548 'lib/gl/include', |
| 551 ], | 549 ], |
| 552 'sources': [ | 550 'sources': [ |
| 553 'examples/gles2_spinning_cube/gles2_spinning_cube.cc', | 551 'examples/gles2_spinning_cube/gles2_spinning_cube.cc', |
| 554 'examples/gles2_spinning_cube/spinning_cube.cc', | 552 'examples/gles2_spinning_cube/spinning_cube.cc', |
| 555 'examples/gles2_spinning_cube/spinning_cube.h', | 553 'examples/gles2_spinning_cube/spinning_cube.h', |
| 556 ], | 554 ], |
| 557 }, | 555 }, |
| 558 ], | 556 ], |
| 559 } | 557 } |
| OLD | NEW |