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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1951783002: Remove --enable-mac-views-app-list on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gn on not mac Created 4 years, 7 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 'variables': { 5 'variables': {
6 'chrome_unit_tests_sources': [ 6 'chrome_unit_tests_sources': [
7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
8 # dependency is needed to make commit bots run unit_tests on 8 # dependency is needed to make commit bots run unit_tests on
9 # histograms.xml changes. 9 # histograms.xml changes.
10 '../tools/metrics/histograms/histograms.xml', 10 '../tools/metrics/histograms/histograms.xml',
(...skipping 2732 matching lines...) Expand 10 before | Expand all | Expand 10 after
2743 ['safe_browsing==1 and enable_extensions==1', { 2743 ['safe_browsing==1 and enable_extensions==1', {
2744 'sources': [ 2744 'sources': [
2745 'browser/extensions/blacklist_unittest.cc', 2745 'browser/extensions/blacklist_unittest.cc',
2746 ], 2746 ],
2747 }], 2747 }],
2748 ['enable_app_list==1', { 2748 ['enable_app_list==1', {
2749 'sources': [ '<@(chrome_unit_tests_app_list_sources)' ], 2749 'sources': [ '<@(chrome_unit_tests_app_list_sources)' ],
2750 'dependencies': [ 2750 'dependencies': [
2751 '../ui/app_list/app_list.gyp:app_list_test_support', 2751 '../ui/app_list/app_list.gyp:app_list_test_support',
2752 ], 2752 ],
2753 }], 2753 'conditions': [
2754 ['enable_app_list==1 and chromeos==1', { 2754 ['chromeos==1', {
2755 'sources': [ '<@(chrome_unit_tests_app_list_chromeos_sources)' ], 2755 'sources': [ '<@(chrome_unit_tests_app_list_chromeos_sources)' ],
2756 }],
2757 ['OS=="mac"', {
2758 'sources!': [
2759 # This assumes the AppList is views-based.
msw 2016/05/05 01:51:07 nit: "and Mac uses Cocoa"?
tapted 2016/05/05 02:53:42 yep added "but Mac only links browser parts for th
2760 'browser/ui/app_list/app_list_shower_views_unittest.cc',
2761 ],
2762 }],
2763 ],
2756 }], 2764 }],
2757 ['enable_app_list==1 and chromeos==1', { 2765 ['enable_app_list==1 and chromeos==1', {
msw 2016/05/05 01:51:07 optional nit: merge this with your nested chromeos
tapted 2016/05/05 02:53:42 Hum - I guess this was from a time when there was
2758 'sources': [ '<@(chrome_unit_tests_app_list_chromeos_arc_sources)' ], 2766 'sources': [ '<@(chrome_unit_tests_app_list_chromeos_arc_sources)' ],
2759 'dependencies': [ 2767 'dependencies': [
2760 '../components/components.gyp:arc_test_support', 2768 '../components/components.gyp:arc_test_support',
2761 ], 2769 ],
2762 }], 2770 }],
2763 ['chromeos==1', { 2771 ['chromeos==1', {
2764 'sources': [ '<@(chrome_unit_tests_arc_sources)' ], 2772 'sources': [ '<@(chrome_unit_tests_arc_sources)' ],
2765 'dependencies': [ 2773 'dependencies': [
2766 '../components/components.gyp:arc_test_support', 2774 '../components/components.gyp:arc_test_support',
2767 ], 2775 ],
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
3007 'dependencies': [ 3015 'dependencies': [
3008 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 3016 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
3009 ], 3017 ],
3010 }], 3018 }],
3011 ], 3019 ],
3012 }, 3020 },
3013 ], 3021 ],
3014 }], 3022 }],
3015 ], # 'conditions' 3023 ], # 'conditions'
3016 } 3024 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698