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

Side by Side Diff: build/all.gyp

Issue 1915493003: [iOS] Remove dependency on //mojo on iOS due to build failure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « no previous file | 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 # 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'dependencies': [ 46 'dependencies': [
47 '../ui/touch_selection/ui_touch_selection.gyp:*', 47 '../ui/touch_selection/ui_touch_selection.gyp:*',
48 ], 48 ],
49 }], 49 }],
50 ['OS=="ios"', { 50 ['OS=="ios"', {
51 'dependencies': [ 51 'dependencies': [
52 '../ios/ios.gyp:*', 52 '../ios/ios.gyp:*',
53 # NOTE: This list of targets is present because 53 # NOTE: This list of targets is present because
54 # mojo_base.gyp:mojo_base cannot be built on iOS, as 54 # mojo_base.gyp:mojo_base cannot be built on iOS, as
55 # javascript-related targets cause v8 to be built. 55 # javascript-related targets cause v8 to be built.
56 '../mojo/mojo_base.gyp:mojo_common_lib',
57 '../mojo/mojo_base.gyp:mojo_common_unittests',
58 '../mojo/mojo_edk.gyp:mojo_system_impl',
59 # TODO(crbug.com/605508): http://crrev.com/1832703002 introduced 56 # TODO(crbug.com/605508): http://crrev.com/1832703002 introduced
60 # a dependency on //third_party/WebKit that cause build failures 57 # a dependency on //third_party/WebKit that cause build failures
61 # when using Xcode version of clang (loading clang plugin fails). 58 # when using Xcode version of clang (loading clang plugin fails).
59 # '../mojo/mojo_base.gyp:mojo_common_lib',
60 # '../mojo/mojo_base.gyp:mojo_common_unittests',
61 # '../mojo/mojo_edk.gyp:mojo_system_impl',
62 # '../mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests', 62 # '../mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
63 '../mojo/mojo_edk_tests.gyp:mojo_public_system_unittests', 63 # '../mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',
64 '../mojo/mojo_edk_tests.gyp:mojo_system_unittests', 64 # '../mojo/mojo_edk_tests.gyp:mojo_system_unittests',
65 '../mojo/mojo_public.gyp:mojo_cpp_bindings', 65 # '../mojo/mojo_public.gyp:mojo_cpp_bindings',
66 '../mojo/mojo_public.gyp:mojo_public_test_utils', 66 # '../mojo/mojo_public.gyp:mojo_public_test_utils',
67 '../mojo/mojo_public.gyp:mojo_system', 67 # '../mojo/mojo_public.gyp:mojo_system',
68 '../google_apis/google_apis.gyp:google_apis_unittests', 68 '../google_apis/google_apis.gyp:google_apis_unittests',
69 '../skia/skia_tests.gyp:skia_unittests', 69 '../skia/skia_tests.gyp:skia_unittests',
70 '../ui/base/ui_base_tests.gyp:ui_base_unittests', 70 '../ui/base/ui_base_tests.gyp:ui_base_unittests',
71 '../ui/gfx/gfx_tests.gyp:gfx_unittests', 71 '../ui/gfx/gfx_tests.gyp:gfx_unittests',
72 ], 72 ],
73 }, { # 'OS!="ios" 73 }, { # 'OS!="ios"
74 'dependencies': [ 74 'dependencies': [
75 '../content/content.gyp:*', 75 '../content/content.gyp:*',
76 '../device/bluetooth/bluetooth.gyp:*', 76 '../device/bluetooth/bluetooth.gyp:*',
77 '../device/device_tests.gyp:*', 77 '../device/device_tests.gyp:*',
(...skipping 1301 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 'dependencies': [ 1379 'dependencies': [
1380 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1380 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1381 '../ui/views/views.gyp:views', 1381 '../ui/views/views.gyp:views',
1382 '../ui/views/views.gyp:views_unittests', 1382 '../ui/views/views.gyp:views_unittests',
1383 ], 1383 ],
1384 }, # target_name: macviews_builder 1384 }, # target_name: macviews_builder
1385 ], # targets 1385 ], # targets
1386 }], # os=='mac' and toolkit_views==1 1386 }], # os=='mac' and toolkit_views==1
1387 ], # conditions 1387 ], # conditions
1388 } 1388 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698