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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 501303002: [Mac] Make app shims load the same framework version as the running Chrome process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 6 years, 3 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
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 'targets': [ 5 'targets': [
6 { 6 {
7 # This target contains mocks and test utilities that don't belong in 7 # This target contains mocks and test utilities that don't belong in
8 # production libraries but are used by more than one test executable. 8 # production libraries but are used by more than one test executable.
9 'target_name': 'test_support_common', 9 'target_name': 'test_support_common',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 1854 matching lines...) Expand 10 before | Expand all | Expand 10 after
1865 'common/extensions/permissions/socket_permission_unittest.cc', 1865 'common/extensions/permissions/socket_permission_unittest.cc',
1866 'common/extensions/permissions/usb_device_permission_unittest.cc', 1866 'common/extensions/permissions/usb_device_permission_unittest.cc',
1867 'common/extensions/sync_type_unittest.cc', 1867 'common/extensions/sync_type_unittest.cc',
1868 'common/extensions/update_manifest_unittest.cc', 1868 'common/extensions/update_manifest_unittest.cc',
1869 'common/extensions/value_counter_unittest.cc', 1869 'common/extensions/value_counter_unittest.cc',
1870 'common/extensions/api/extension_api_unittest.cc', 1870 'common/extensions/api/extension_api_unittest.cc',
1871 'common/favicon/favicon_url_parser_unittest.cc', 1871 'common/favicon/favicon_url_parser_unittest.cc',
1872 'common/importer/firefox_importer_utils_unittest.cc', 1872 'common/importer/firefox_importer_utils_unittest.cc',
1873 'common/ini_parser_unittest.cc', 1873 'common/ini_parser_unittest.cc',
1874 'common/instant_restricted_id_cache_unittest.cc', 1874 'common/instant_restricted_id_cache_unittest.cc',
1875 'common/mac/app_mode_chrome_locator_unittest.mm',
1875 'common/mac/cfbundle_blocker_unittest.mm', 1876 'common/mac/cfbundle_blocker_unittest.mm',
1876 'common/mac/mock_launchd.cc', 1877 'common/mac/mock_launchd.cc',
1877 'common/mac/mock_launchd.h', 1878 'common/mac/mock_launchd.h',
1878 'common/mac/objc_zombie_unittest.mm', 1879 'common/mac/objc_zombie_unittest.mm',
1879 'common/multi_process_lock_unittest.cc', 1880 'common/multi_process_lock_unittest.cc',
1880 'common/net/x509_certificate_model_unittest.cc', 1881 'common/net/x509_certificate_model_unittest.cc',
1881 'common/partial_circular_buffer_unittest.cc', 1882 'common/partial_circular_buffer_unittest.cc',
1882 'common/pepper_permission_util_unittest.cc', 1883 'common/pepper_permission_util_unittest.cc',
1883 'common/pref_names_util_unittest.cc', 1884 'common/pref_names_util_unittest.cc',
1884 'common/search_urls_unittest.cc', 1885 'common/search_urls_unittest.cc',
(...skipping 516 matching lines...) Expand 10 before | Expand all | Expand 10 after
2401 ], 2402 ],
2402 }], 2403 }],
2403 ], 2404 ],
2404 }], 2405 }],
2405 ['OS=="mac"', { 2406 ['OS=="mac"', {
2406 # The test fetches resources which means Mac need the app bundle to 2407 # The test fetches resources which means Mac need the app bundle to
2407 # exist on disk so it can pull from it. 2408 # exist on disk so it can pull from it.
2408 'dependencies': [ 2409 'dependencies': [
2409 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac', 2410 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac',
2410 '../third_party/ocmock/ocmock.gyp:ocmock', 2411 '../third_party/ocmock/ocmock.gyp:ocmock',
2412 'app_mode_app_support',
2411 'chrome', 2413 'chrome',
2412 ], 2414 ],
2413 'sources!': [ 2415 'sources!': [
2414 'browser/ui/tests/ui_gfx_image_unittest.cc', 2416 'browser/ui/tests/ui_gfx_image_unittest.cc',
2415 'tools/convert_dict/convert_dict_unittest.cc', 2417 'tools/convert_dict/convert_dict_unittest.cc',
2416 'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc', 2418 'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc',
2417 ], 2419 ],
2418 # TODO(mark): We really want this for all non-static library targets, 2420 # TODO(mark): We really want this for all non-static library targets,
2419 # but when we tried to pull it up to the common.gypi level, it broke 2421 # but when we tried to pull it up to the common.gypi level, it broke
2420 # other things like the ui and startup tests. *shrug* 2422 # other things like the ui and startup tests. *shrug*
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
2887 'dependencies': [ 2889 'dependencies': [
2888 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2890 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2889 ], 2891 ],
2890 }], 2892 }],
2891 ], 2893 ],
2892 }, 2894 },
2893 ], 2895 ],
2894 }], 2896 }],
2895 ], # 'conditions' 2897 ], # 'conditions'
2896 } 2898 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698