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

Side by Side Diff: build/all.gyp

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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 | « BUILD.gn ('k') | build/gn_migration.gypi » ('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 (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 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. 8 # compilation targets to 'All'.
9 'app_targets%': [], 9 'app_targets%': [],
10 # For Android-specific targets. 10 # For Android-specific targets.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 ['OS=="ios"', { 50 ['OS=="ios"', {
51 'dependencies': [ 51 'dependencies': [
52 '../chrome/chrome.gyp:browser', 52 '../chrome/chrome.gyp:browser',
53 '../chrome/chrome.gyp:browser_ui', 53 '../chrome/chrome.gyp:browser_ui',
54 '../ios/ios.gyp:*', 54 '../ios/ios.gyp:*',
55 # NOTE: This list of targets is present because 55 # NOTE: This list of targets is present because
56 # mojo_base.gyp:mojo_base cannot be built on iOS, as 56 # mojo_base.gyp:mojo_base cannot be built on iOS, as
57 # javascript-related targets cause v8 to be built. 57 # javascript-related targets cause v8 to be built.
58 '../mojo/mojo_base.gyp:mojo_common_lib', 58 '../mojo/mojo_base.gyp:mojo_common_lib',
59 '../mojo/mojo_base.gyp:mojo_common_unittests', 59 '../mojo/mojo_base.gyp:mojo_common_unittests',
60 '../mojo/mojo_edk.gyp:mojo_system_impl',
61 '../mojo/mojo_edk_tests.gyp:mojo_system_unittests',
60 '../google_apis/google_apis.gyp:google_apis_unittests', 62 '../google_apis/google_apis.gyp:google_apis_unittests',
61 '../skia/skia_tests.gyp:skia_unittests', 63 '../skia/skia_tests.gyp:skia_unittests',
62 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
63 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittes ts', 64 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittes ts',
64 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unit tests', 65 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unit tests',
65 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests ', 66 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests ',
66 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittest s', 67 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittest s',
67 '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests',
68 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 68 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
69 '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils', 69 '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
70 '../third_party/mojo/mojo_public.gyp:mojo_system', 70 '../third_party/mojo/mojo_public.gyp:mojo_system',
71 '../ui/base/ui_base_tests.gyp:ui_base_unittests', 71 '../ui/base/ui_base_tests.gyp:ui_base_unittests',
72 '../ui/gfx/gfx_tests.gyp:gfx_unittests', 72 '../ui/gfx/gfx_tests.gyp:gfx_unittests',
73 ], 73 ],
74 }, { # 'OS!="ios" 74 }, { # 'OS!="ios"
75 'dependencies': [ 75 'dependencies': [
76 '../device/bluetooth/bluetooth.gyp:*', 76 '../device/bluetooth/bluetooth.gyp:*',
77 '../device/device_tests.gyp:*', 77 '../device/device_tests.gyp:*',
(...skipping 1363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1441 'dependencies': [ 1441 'dependencies': [
1442 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1442 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1443 '../ui/views/views.gyp:views', 1443 '../ui/views/views.gyp:views',
1444 '../ui/views/views.gyp:views_unittests', 1444 '../ui/views/views.gyp:views_unittests',
1445 ], 1445 ],
1446 }, # target_name: macviews_builder 1446 }, # target_name: macviews_builder
1447 ], # targets 1447 ], # targets
1448 }], # os=='mac' and toolkit_views==1 1448 }], # os=='mac' and toolkit_views==1
1449 ], # conditions 1449 ], # conditions
1450 } 1450 }
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | build/gn_migration.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698