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

Side by Side Diff: chrome/chrome_tests.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: Sync and rebase 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
« no previous file with comments | « chrome/browser/apps/shortcut_manager.cc ('k') | chrome/common/mac/app_mode_chrome_locator.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'includes': [ 5 'includes': [
6 'js_unittest_vars.gypi', 6 'js_unittest_vars.gypi',
7 ], 7 ],
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'interactive_ui_tests', 10 'target_name': 'interactive_ui_tests',
(...skipping 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after
1549 'browser/ui/webui/policy_ui_browsertest.cc', 1549 'browser/ui/webui/policy_ui_browsertest.cc',
1550 'browser/ui/webui/print_preview/print_preview_ui_browsertest.cc', 1550 'browser/ui/webui/print_preview/print_preview_ui_browsertest.cc',
1551 'browser/ui/webui/signin/user_manager_ui_browsertest.cc', 1551 'browser/ui/webui/signin/user_manager_ui_browsertest.cc',
1552 'browser/ui/webui/signin/inline_login_ui_browsertest.cc', 1552 'browser/ui/webui/signin/inline_login_ui_browsertest.cc',
1553 'browser/ui/webui/sync_internals_browsertest.js', 1553 'browser/ui/webui/sync_internals_browsertest.js',
1554 'browser/ui/webui/sync_setup_browsertest.js', 1554 'browser/ui/webui/sync_setup_browsertest.js',
1555 'browser/ui/webui/web_ui_test_handler.cc', 1555 'browser/ui/webui/web_ui_test_handler.cc',
1556 'browser/ui/webui/web_ui_test_handler.h', 1556 'browser/ui/webui/web_ui_test_handler.h',
1557 'browser/ui/zoom/zoom_controller_browsertest.cc', 1557 'browser/ui/zoom/zoom_controller_browsertest.cc',
1558 'browser/unload_browsertest.cc', 1558 'browser/unload_browsertest.cc',
1559 'common/mac/app_mode_chrome_locator_browsertest.mm',
1559 'common/mac/mock_launchd.cc', 1560 'common/mac/mock_launchd.cc',
1560 'common/mac/mock_launchd.h', 1561 'common/mac/mock_launchd.h',
1561 'common/time_format_browsertest.cc', 1562 'common/time_format_browsertest.cc',
1562 'renderer/chrome_content_renderer_client_browsertest.cc', 1563 'renderer/chrome_content_renderer_client_browsertest.cc',
1563 'renderer/autofill/autofill_renderer_browsertest.cc', 1564 'renderer/autofill/autofill_renderer_browsertest.cc',
1564 'renderer/autofill/form_autocomplete_browsertest.cc', 1565 'renderer/autofill/form_autocomplete_browsertest.cc',
1565 'renderer/autofill/form_autofill_browsertest.cc', 1566 'renderer/autofill/form_autofill_browsertest.cc',
1566 'renderer/autofill/page_click_tracker_browsertest.cc', 1567 'renderer/autofill/page_click_tracker_browsertest.cc',
1567 'renderer/autofill/password_autofill_agent_browsertest.cc', 1568 'renderer/autofill/password_autofill_agent_browsertest.cc',
1568 'renderer/autofill/password_generation_agent_browsertest.cc', 1569 'renderer/autofill/password_generation_agent_browsertest.cc',
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 # level, it broke other things like the ui and startup tests. *shrug* 1934 # level, it broke other things like the ui and startup tests. *shrug*
1934 'xcode_settings': { 1935 'xcode_settings': {
1935 'OTHER_LDFLAGS': [ 1936 'OTHER_LDFLAGS': [
1936 '-Wl,-ObjC', 1937 '-Wl,-ObjC',
1937 ], 1938 ],
1938 }, 1939 },
1939 # Other platforms only need 1940 # Other platforms only need
1940 # chrome_resources.gyp:{packed_extra_resources,packed_resources}, 1941 # chrome_resources.gyp:{packed_extra_resources,packed_resources},
1941 # and can build this target standalone much faster. 1942 # and can build this target standalone much faster.
1942 'dependencies': [ 1943 'dependencies': [
1944 'app_mode_app_support',
1943 'chrome', 1945 'chrome',
1944 '../components/components.gyp:breakpad_stubs', 1946 '../components/components.gyp:breakpad_stubs',
1945 '../third_party/ocmock/ocmock.gyp:ocmock', 1947 '../third_party/ocmock/ocmock.gyp:ocmock',
1946 ], 1948 ],
1947 'sources': [ 1949 'sources': [
1948 'browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc ', 1950 'browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc ',
1949 'browser/renderer_host/chrome_render_widget_host_view_mac_delegate_b rowsertest.cc', 1951 'browser/renderer_host/chrome_render_widget_host_view_mac_delegate_b rowsertest.cc',
1950 'browser/renderer_host/chrome_render_widget_host_view_mac_history_sw iper_browsertest.mm', 1952 'browser/renderer_host/chrome_render_widget_host_view_mac_history_sw iper_browsertest.mm',
1951 'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc', 1953 'browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc',
1952 ], 1954 ],
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
2682 '../base/base.gyp:base', 2684 '../base/base.gyp:base',
2683 '../base/base.gyp:run_all_unittests', 2685 '../base/base.gyp:run_all_unittests',
2684 '../testing/gtest.gyp:gtest', 2686 '../testing/gtest.gyp:gtest',
2685 ], 2687 ],
2686 'include_dirs': [ 2688 'include_dirs': [
2687 '..,' 2689 '..,'
2688 ], 2690 ],
2689 }, 2691 },
2690 ], 2692 ],
2691 'conditions': [ 2693 'conditions': [
2692 ['OS=="mac"', {
2693 'targets': [
2694 {
2695 # Tests for Mac app launcher.
2696 'target_name': 'app_mode_app_tests',
2697 'type': 'executable',
2698 'product_name': 'app_mode_app_tests',
2699 'dependencies': [
2700 '../base/base.gyp:test_support_base',
2701 '../chrome/common_constants.gyp:common_constants',
2702 '../testing/gtest.gyp:gtest',
2703 'chrome.gyp:chrome', # run time dependency
2704 'app_mode_app_support',
2705 ],
2706 'sources': [
2707 'common/mac/app_mode_chrome_locator_unittest.mm',
2708 'test/base/app_mode_app_tests.cc',
2709 ],
2710 'include_dirs': [
2711 '..',
2712 ],
2713 'link_settings': {
2714 'libraries': [
2715 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
2716 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
2717 ],
2718 },
2719 }, # target app_mode_app_tests
2720 ],
2721 }],
2722 ['OS!="mac"', { 2694 ['OS!="mac"', {
2723 'targets': [ 2695 'targets': [
2724 { 2696 {
2725 'target_name': 'perf_tests', 2697 'target_name': 'perf_tests',
2726 'type': 'executable', 2698 'type': 'executable',
2727 'dependencies': [ 2699 'dependencies': [
2728 'browser', 2700 'browser',
2729 'chrome_resources.gyp:chrome_resources', 2701 'chrome_resources.gyp:chrome_resources',
2730 'chrome_resources.gyp:chrome_strings', 2702 'chrome_resources.gyp:chrome_strings',
2731 'common', 2703 'common',
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
3063 ['enable_webrtc==1', { 3035 ['enable_webrtc==1', {
3064 'dependencies': [ 3036 'dependencies': [
3065 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 3037 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
3066 ] 3038 ]
3067 }], 3039 }],
3068 ], 3040 ],
3069 }] 3041 }]
3070 }], 3042 }],
3071 ], # 'conditions' 3043 ], # 'conditions'
3072 } 3044 }
OLDNEW
« no previous file with comments | « chrome/browser/apps/shortcut_manager.cc ('k') | chrome/common/mac/app_mode_chrome_locator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698