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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 11226060: RLZ: remove hard-coded Win || Mac conditions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 8 years, 1 month 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 | « chrome/chrome_browser.gypi ('k') | rlz/lib/rlz_lib.h » ('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 2504 matching lines...) Expand 10 before | Expand all | Expand 10 after
2515 'chrome_resources.gyp:packed_resources', 2515 'chrome_resources.gyp:packed_resources',
2516 'convert_dict_lib', 2516 'convert_dict_lib',
2517 '../third_party/hunspell/hunspell.gyp:hunspell', 2517 '../third_party/hunspell/hunspell.gyp:hunspell',
2518 ], 2518 ],
2519 'sources!': [ 2519 'sources!': [
2520 'browser/spellchecker/spellchecker_platform_engine_unittest.cc', 2520 'browser/spellchecker/spellchecker_platform_engine_unittest.cc',
2521 ], 2521 ],
2522 }], 2522 }],
2523 ['OS!="win" and OS!="mac"', { 2523 ['OS!="win" and OS!="mac"', {
2524 'sources!': [ 2524 'sources!': [
2525 '../skia/ext/platform_canvas_unittest.cc',
2526 ],
2527 }],
2528 ['enable_rlz==0', {
2529 'sources!': [
2525 'browser/rlz/rlz_unittest.cc', 2530 'browser/rlz/rlz_unittest.cc',
2526 '../skia/ext/platform_canvas_unittest.cc',
2527 ], 2531 ],
2528 }], 2532 }],
2529 ['OS=="win" and component!="shared_library"', { 2533 ['OS=="win" and component!="shared_library"', {
2530 # Unit_tests pdb files can get too big when incremental linking is 2534 # Unit_tests pdb files can get too big when incremental linking is
2531 # on, disabling for this target. 2535 # on, disabling for this target.
2532 'configurations': { 2536 'configurations': {
2533 'Debug': { 2537 'Debug': {
2534 'msvs_settings': { 2538 'msvs_settings': {
2535 'VCLinkerTool': { 2539 'VCLinkerTool': {
2536 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 2540 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
(...skipping 882 matching lines...) Expand 10 before | Expand all | Expand 10 after
3419 ['internal_pdf', { 3423 ['internal_pdf', {
3420 'sources': [ 3424 'sources': [
3421 'browser/ui/pdf/pdf_browsertest.cc', 3425 'browser/ui/pdf/pdf_browsertest.cc',
3422 ], 3426 ],
3423 }], 3427 }],
3424 ['OS!="linux" or toolkit_views==1', { 3428 ['OS!="linux" or toolkit_views==1', {
3425 'sources!': [ 3429 'sources!': [
3426 'browser/ui/gtk/view_id_util_browsertest.cc', 3430 'browser/ui/gtk/view_id_util_browsertest.cc',
3427 ], 3431 ],
3428 }], 3432 }],
3429 ['OS!="win" and OS!="mac"', { 3433 ['enable_rlz==0', {
3430 'sources!': [ 3434 'sources!': [
3431 'browser/rlz/rlz_extension_apitest.cc', 3435 'browser/rlz/rlz_extension_apitest.cc',
3432 ], 3436 ],
3433 }], 3437 }],
3434 ['OS=="win"', { 3438 ['OS=="win"', {
3435 'sources': [ 3439 'sources': [
3436 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 3440 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
3437 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 3441 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
3438 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 3442 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
3439 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 3443 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
(...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after
4952 'sync_integration_tests.isolate', 4956 'sync_integration_tests.isolate',
4953 ], 4957 ],
4954 'sources': [ 4958 'sources': [
4955 'sync_integration_tests.isolate', 4959 'sync_integration_tests.isolate',
4956 ], 4960 ],
4957 }, 4961 },
4958 ], 4962 ],
4959 }], 4963 }],
4960 ], # 'conditions' 4964 ], # 'conditions'
4961 } 4965 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | rlz/lib/rlz_lib.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698