| Index: content/content_tests.gypi
|
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi
|
| index 1829548f8d8680fad136f034a36153402c7cd311..f8e681df7b63d8f5f1760b892b052bc64a7a2821 100644
|
| --- a/content/content_tests.gypi
|
| +++ b/content/content_tests.gypi
|
| @@ -1227,11 +1227,6 @@
|
| '../dbus/dbus.gyp:dbus_test_support',
|
| ],
|
| }],
|
| - ['OS=="win" and win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| ['OS=="win"', {
|
| 'dependencies': [
|
| '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
|
| @@ -1365,11 +1360,6 @@
|
| '../testing/android/native_test.gyp:native_test_native_code',
|
| ],
|
| }],
|
| - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| ],
|
| },
|
| {
|
| @@ -1533,11 +1523,6 @@
|
| # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
|
| 'msvs_disabled_warnings': [ 4267, ],
|
| }],
|
| - ['OS=="win" and win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| ['OS=="android"', {
|
| 'sources': [ '<@(content_browsertests_android_sources)' ],
|
| 'sources!': [
|
| @@ -1637,11 +1622,6 @@
|
| '../third_party/mesa/mesa.gyp:osmesa',
|
| ],
|
| }],
|
| - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| ],
|
| },
|
| {
|
| @@ -1666,13 +1646,6 @@
|
| 'sources': [
|
| 'common/gpu/client/gl_helper_benchmark.cc',
|
| ],
|
| - 'conditions': [
|
| - ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ],
|
| },
|
| ],
|
| }],
|
| @@ -1729,13 +1702,6 @@
|
| '<(angle_path)/src/angle.gyp:libGLESv2',
|
| ],
|
| }],
|
| - ['(OS=="win" and win_use_allocator_shim==1) or '
|
| - '(os_posix == 1 and OS != "android" and '
|
| - ' use_allocator!="none")', {
|
| - 'dependencies': [
|
| - '../base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| ['target_arch != "arm" and (OS=="linux" or chromeos == 1)', {
|
| 'include_dirs': [
|
| '<(DEPTH)/third_party/libva',
|
|
|