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

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: 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 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 2671 matching lines...) Expand 10 before | Expand all | Expand 10 after
2682 '../base/base.gyp:base', 2682 '../base/base.gyp:base',
2683 '../base/base.gyp:run_all_unittests', 2683 '../base/base.gyp:run_all_unittests',
2684 '../testing/gtest.gyp:gtest', 2684 '../testing/gtest.gyp:gtest',
2685 ], 2685 ],
2686 'include_dirs': [ 2686 'include_dirs': [
2687 '..,' 2687 '..,'
2688 ], 2688 ],
2689 }, 2689 },
2690 ], 2690 ],
2691 'conditions': [ 2691 '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"', { 2692 ['OS!="mac"', {
2723 'targets': [ 2693 'targets': [
2724 { 2694 {
2725 'target_name': 'perf_tests', 2695 'target_name': 'perf_tests',
2726 'type': 'executable', 2696 'type': 'executable',
2727 'dependencies': [ 2697 'dependencies': [
2728 'browser', 2698 'browser',
2729 'chrome_resources.gyp:chrome_resources', 2699 'chrome_resources.gyp:chrome_resources',
2730 'chrome_resources.gyp:chrome_strings', 2700 'chrome_resources.gyp:chrome_strings',
2731 'common', 2701 'common',
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
3063 ['enable_webrtc==1', { 3033 ['enable_webrtc==1', {
3064 'dependencies': [ 3034 'dependencies': [
3065 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc' 3035 '../third_party/libjingle/libjingle.gyp:libjingle_webrtc'
3066 ] 3036 ]
3067 }], 3037 }],
3068 ], 3038 ],
3069 }] 3039 }]
3070 }], 3040 }],
3071 ], # 'conditions' 3041 ], # 'conditions'
3072 } 3042 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698