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

Side by Side Diff: webkit/renderer/compositor_bindings/compositor_bindings_tests.gyp

Issue 258433005: Remove {linux|android}_use_tcmalloc and switch to use_allocator in Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « url/url.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 'webkit_compositor_bindings_tests_sources': [ 8 'webkit_compositor_bindings_tests_sources': [
9 'web_animation_unittest.cc', 9 'web_animation_unittest.cc',
10 'web_float_animation_curve_unittest.cc', 10 'web_float_animation_curve_unittest.cc',
(...skipping 21 matching lines...) Expand all
32 '<(DEPTH)' 32 '<(DEPTH)'
33 ], 33 ],
34 'conditions': [ 34 'conditions': [
35 ['OS == "android" and gtest_target_type == "shared_library"', { 35 ['OS == "android" and gtest_target_type == "shared_library"', {
36 'dependencies': [ 36 'dependencies': [
37 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code', 37 '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
38 ], 38 ],
39 }], 39 }],
40 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 40 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
41 'conditions': [ 41 'conditions': [
42 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 42 [ 'use_allocator!="none"', {
43 [ '(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
44 'dependencies': [ 43 'dependencies': [
45 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 44 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
46 ], 45 ],
47 }], 46 }],
48 ], 47 ],
49 }], 48 }],
50 ], 49 ],
51 }, 50 },
52 ], 51 ],
53 'conditions': [ 52 'conditions': [
54 # Special target to wrap a gtest_target_type==shared_library 53 # Special target to wrap a gtest_target_type==shared_library
55 # package webkit_compositor_bindings_unittests into an android apk for execu tion. 54 # package webkit_compositor_bindings_unittests into an android apk for execu tion.
56 ['OS == "android" and gtest_target_type == "shared_library"', { 55 ['OS == "android" and gtest_target_type == "shared_library"', {
57 'targets': [ 56 'targets': [
58 { 57 {
59 'target_name': 'webkit_compositor_bindings_unittests_apk', 58 'target_name': 'webkit_compositor_bindings_unittests_apk',
60 'type': 'none', 59 'type': 'none',
61 'dependencies': [ 60 'dependencies': [
62 'webkit_compositor_bindings_unittests', 61 'webkit_compositor_bindings_unittests',
63 ], 62 ],
64 'variables': { 63 'variables': {
65 'test_suite_name': 'webkit_compositor_bindings_unittests', 64 'test_suite_name': 'webkit_compositor_bindings_unittests',
66 }, 65 },
67 'includes': [ '../../../build/apk_test.gypi' ], 66 'includes': [ '../../../build/apk_test.gypi' ],
68 }, 67 },
69 ], 68 ],
70 }], 69 }],
71 ], 70 ],
72 } 71 }
OLDNEW
« no previous file with comments | « url/url.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698