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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 10704208: Some misc gyp fix-up for Android (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | ppapi/ppapi.gyp » ('j') | 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 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 ['toolkit_uses_gtk == 0', { 826 ['toolkit_uses_gtk == 0', {
827 'sources!': [ 827 'sources!': [
828 'test/webdriver/keycode_text_conversion_gtk.cc', 828 'test/webdriver/keycode_text_conversion_gtk.cc',
829 ], 829 ],
830 }], 830 }],
831 ['OS=="linux" and toolkit_views==1', { 831 ['OS=="linux" and toolkit_views==1', {
832 'dependencies': [ 832 'dependencies': [
833 '../ui/views/views.gyp:views', 833 '../ui/views/views.gyp:views',
834 ], 834 ],
835 }], 835 }],
836 ['os_posix == 1 and OS != "mac"', { 836 ['os_posix == 1 and OS != "mac" and OS != "android"', {
John Grabowski 2012/07/13 18:19:46 /me wishes there was some way of consolidating thi
837 'conditions': [ 837 'conditions': [
838 ['linux_use_tcmalloc==1', { 838 ['linux_use_tcmalloc==1', {
839 'dependencies': [ 839 'dependencies': [
840 '../base/allocator/allocator.gyp:allocator', 840 '../base/allocator/allocator.gyp:allocator',
841 ], 841 ],
842 }], 842 }],
843 ], 843 ],
844 }], 844 }],
845 ], 845 ],
846 }, 846 },
(...skipping 1412 matching lines...) Expand 10 before | Expand all | Expand 10 after
2259 'browser/password_manager/native_backend_gnome_x_unittest.cc', 2259 'browser/password_manager/native_backend_gnome_x_unittest.cc',
2260 ], 2260 ],
2261 }], 2261 }],
2262 ['OS=="linux" and use_aura==1', { 2262 ['OS=="linux" and use_aura==1', {
2263 'dependencies': [ 2263 'dependencies': [
2264 '../build/linux/system.gyp:dbus', 2264 '../build/linux/system.gyp:dbus',
2265 '../dbus/dbus.gyp:dbus_test_support', 2265 '../dbus/dbus.gyp:dbus_test_support',
2266 '../ui/aura/aura.gyp:test_support_aura', 2266 '../ui/aura/aura.gyp:test_support_aura',
2267 ], 2267 ],
2268 }], 2268 }],
2269 ['os_posix == 1 and OS != "mac"', { 2269 ['os_posix == 1 and OS != "mac" and OS != "android"', {
2270 'conditions': [ 2270 'conditions': [
2271 ['linux_use_tcmalloc==1', { 2271 ['linux_use_tcmalloc==1', {
2272 'dependencies': [ 2272 'dependencies': [
2273 '../base/allocator/allocator.gyp:allocator', 2273 '../base/allocator/allocator.gyp:allocator',
2274 ], 2274 ],
2275 }], 2275 }],
2276 ], 2276 ],
2277 }], 2277 }],
2278 ['OS=="mac"', { 2278 ['OS=="mac"', {
2279 # The test fetches resources which means Mac need the app bundle to 2279 # The test fetches resources which means Mac need the app bundle to
(...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after
3304 'browser/spellchecker/spellcheck_host_browsertest.cc', 3304 'browser/spellchecker/spellcheck_host_browsertest.cc',
3305 # ProcessSingletonMac doesn't do anything. 3305 # ProcessSingletonMac doesn't do anything.
3306 'browser/process_singleton_browsertest.cc', 3306 'browser/process_singleton_browsertest.cc',
3307 ], 3307 ],
3308 }], 3308 }],
3309 ['os_posix == 0 or chromeos == 1', { 3309 ['os_posix == 0 or chromeos == 1', {
3310 'sources!': [ 3310 'sources!': [
3311 'common/time_format_browsertest.cc', 3311 'common/time_format_browsertest.cc',
3312 ], 3312 ],
3313 }], 3313 }],
3314 ['os_posix == 1 and OS != "mac"', { 3314 ['os_posix == 1 and OS != "mac" and OS != "android"', {
3315 'conditions': [ 3315 'conditions': [
3316 ['linux_use_tcmalloc==1', { 3316 ['linux_use_tcmalloc==1', {
3317 'dependencies': [ 3317 'dependencies': [
3318 '../base/allocator/allocator.gyp:allocator', 3318 '../base/allocator/allocator.gyp:allocator',
3319 ], 3319 ],
3320 }], 3320 }],
3321 ], 3321 ],
3322 }], 3322 }],
3323 ['toolkit_views==1', { 3323 ['toolkit_views==1', {
3324 'dependencies': [ 3324 'dependencies': [
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
3548 '-Wl,-ObjC', 3548 '-Wl,-ObjC',
3549 ], 3549 ],
3550 }, 3550 },
3551 # Other platforms only need 3551 # Other platforms only need
3552 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, 3552 # chrome_resources.gyp:{packed_extra_resources,packed_resources},
3553 # and can build this target standalone much faster. 3553 # and can build this target standalone much faster.
3554 'dependencies': [ 3554 'dependencies': [
3555 'chrome' 3555 'chrome'
3556 ], 3556 ],
3557 }], 3557 }],
3558 ['os_posix == 1 and OS != "mac"', { 3558 ['os_posix == 1 and OS != "mac" and OS != "android"', {
3559 'conditions': [ 3559 'conditions': [
3560 ['linux_use_tcmalloc==1', { 3560 ['linux_use_tcmalloc==1', {
3561 'dependencies': [ 3561 'dependencies': [
3562 '../base/allocator/allocator.gyp:allocator', 3562 '../base/allocator/allocator.gyp:allocator',
3563 ], 3563 ],
3564 }], 3564 }],
3565 ], 3565 ],
3566 }], 3566 }],
3567 ], # conditions 3567 ], # conditions
3568 }, # target performance_browser_tests 3568 }, # target performance_browser_tests
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
3755 'sources': [ 3755 'sources': [
3756 'test/perf/mach_ports_test.cc', 3756 'test/perf/mach_ports_test.cc',
3757 ], 3757 ],
3758 }], 3758 }],
3759 ['toolkit_uses_gtk == 1', { 3759 ['toolkit_uses_gtk == 1', {
3760 'dependencies': [ 3760 'dependencies': [
3761 '../build/linux/system.gyp:gtk', 3761 '../build/linux/system.gyp:gtk',
3762 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3762 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3763 ], 3763 ],
3764 }], 3764 }],
3765 ['os_posix == 1 and OS != "mac"', { 3765 ['os_posix == 1 and OS != "mac" and OS != "android"', {
3766 'conditions': [ 3766 'conditions': [
3767 ['linux_use_tcmalloc==1', { 3767 ['linux_use_tcmalloc==1', {
3768 'dependencies': [ 3768 'dependencies': [
3769 '../base/allocator/allocator.gyp:allocator', 3769 '../base/allocator/allocator.gyp:allocator',
3770 ], 3770 ],
3771 }], 3771 }],
3772 ], 3772 ],
3773 }], 3773 }],
3774 ['toolkit_views==1', { 3774 ['toolkit_views==1', {
3775 'dependencies': [ 3775 'dependencies': [
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
4273 '<(allocator_target)', 4273 '<(allocator_target)',
4274 ], 4274 ],
4275 }], 4275 }],
4276 ], 4276 ],
4277 }], 4277 }],
4278 ['toolkit_views==1', { 4278 ['toolkit_views==1', {
4279 'dependencies': [ 4279 'dependencies': [
4280 '../ui/views/views.gyp:views', 4280 '../ui/views/views.gyp:views',
4281 ], 4281 ],
4282 }], 4282 }],
4283 ['os_posix == 1 and OS != "mac"', { 4283 ['os_posix == 1 and OS != "mac" and OS != "android"', {
4284 'conditions': [ 4284 'conditions': [
4285 ['linux_use_tcmalloc==1', { 4285 ['linux_use_tcmalloc==1', {
4286 'dependencies': [ 4286 'dependencies': [
4287 '../base/allocator/allocator.gyp:allocator', 4287 '../base/allocator/allocator.gyp:allocator',
4288 ], 4288 ],
4289 }], 4289 }],
4290 ], 4290 ],
4291 }], 4291 }],
4292 ], 4292 ],
4293 }, 4293 },
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
4668 # Use outputs of this action as inputs for the main target build. 4668 # Use outputs of this action as inputs for the main target build.
4669 # Seems as a misnomer but makes this happy on Linux (scons). 4669 # Seems as a misnomer but makes this happy on Linux (scons).
4670 'process_outputs_as_sources': 1, 4670 'process_outputs_as_sources': 1,
4671 }, 4671 },
4672 ], # 'actions' 4672 ], # 'actions'
4673 }, 4673 },
4674 ] 4674 ]
4675 }], # 'coverage!=0' 4675 }], # 'coverage!=0'
4676 ], # 'conditions' 4676 ], # 'conditions'
4677 } 4677 }
OLDNEW
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | ppapi/ppapi.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698