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

Side by Side Diff: ui/app_list/presenter/app_list_presenter.gyp

Issue 2012773003: Add ax_gen dependency to app_list_presenter test targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « ui/app_list/presenter/BUILD.gn ('k') | no next file » | 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'msvs_disabled_warnings': [ 4267, ], 45 'msvs_disabled_warnings': [ 4267, ],
46 }, 46 },
47 { 47 {
48 # GN version: //ui/app_list/presenter:test_support 48 # GN version: //ui/app_list/presenter:test_support
49 'target_name': 'app_list_presenter_test_support', 49 'target_name': 'app_list_presenter_test_support',
50 'type': 'static_library', 50 'type': 'static_library',
51 'dependencies': [ 51 'dependencies': [
52 '../../../base/base.gyp:base', 52 '../../../base/base.gyp:base',
53 '../../../skia/skia.gyp:skia', 53 '../../../skia/skia.gyp:skia',
54 'app_list_presenter', 54 'app_list_presenter',
55
56 # Temporary dependency to fix compile flake in http://crbug.com/611898.
57 # TODO(tapted): Remove once http://crbug.com/612382 is fixed.
58 '../../accessibility/accessibility.gyp:ax_gen',
55 ], 59 ],
56 'sources': [ 60 'sources': [
57 # Note: sources list duplicated in GN build. 61 # Note: sources list duplicated in GN build.
58 'test/app_list_presenter_impl_test_api.cc', 62 'test/app_list_presenter_impl_test_api.cc',
59 'test/app_list_presenter_impl_test_api.h', 63 'test/app_list_presenter_impl_test_api.h',
60 ], 64 ],
61 }, 65 },
62 { 66 {
63 # GN version: //ui/app_list/presenter:app_list_presenter_unittests 67 # GN version: //ui/app_list/presenter:app_list_presenter_unittests
64 'target_name': 'app_list_presenter_unittests', 68 'target_name': 'app_list_presenter_unittests',
65 'type': 'executable', 69 'type': 'executable',
66 'dependencies': [ 70 'dependencies': [
67 '../../../base/base.gyp:base', 71 '../../../base/base.gyp:base',
68 '../../../base/base.gyp:test_support_base', 72 '../../../base/base.gyp:test_support_base',
69 '../../../skia/skia.gyp:skia', 73 '../../../skia/skia.gyp:skia',
70 '../../../testing/gtest.gyp:gtest', 74 '../../../testing/gtest.gyp:gtest',
71 '../../aura/aura.gyp:aura_test_support', 75 '../../aura/aura.gyp:aura_test_support',
72 '../../resources/ui_resources.gyp:ui_test_pak', 76 '../../resources/ui_resources.gyp:ui_test_pak',
73 '../../views/views.gyp:views', 77 '../../views/views.gyp:views',
74 '../../wm/wm.gyp:wm', 78 '../../wm/wm.gyp:wm',
75 '../app_list.gyp:app_list_test_support', 79 '../app_list.gyp:app_list_test_support',
76 'app_list_presenter', 80 'app_list_presenter',
77 'app_list_presenter_test_support', 81 'app_list_presenter_test_support',
82
83 # Temporary dependency to fix compile flake in http://crbug.com/611898.
84 # TODO(tapted): Remove once http://crbug.com/612382 is fixed.
85 '../../accessibility/accessibility.gyp:ax_gen',
78 ], 86 ],
79 'sources': [ 87 'sources': [
80 # Note: sources list duplicated in GN build. 88 # Note: sources list duplicated in GN build.
81 'app_list_presenter_impl_unittest.cc', 89 'app_list_presenter_impl_unittest.cc',
82 'test/run_all_unittests.cc', 90 'test/run_all_unittests.cc',
83 ], 91 ],
84 # Disable c4267 warnings until we fix size_t to int truncations. 92 # Disable c4267 warnings until we fix size_t to int truncations.
85 'msvs_disabled_warnings': [ 4267, ], 93 'msvs_disabled_warnings': [ 4267, ],
86 }, 94 },
87 ], 95 ],
(...skipping 17 matching lines...) Expand all
105 'dependencies': [ 113 'dependencies': [
106 '../../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 114 '../../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
107 ], 115 ],
108 }], 116 }],
109 ], 117 ],
110 }, 118 },
111 ], 119 ],
112 }], 120 }],
113 ], 121 ],
114 } 122 }
OLDNEW
« no previous file with comments | « ui/app_list/presenter/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698