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

Side by Side Diff: build/all.gyp

Issue 728133002: Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android + ios gyp fixes Created 6 years, 1 month 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 | content/browser/webui/web_ui_mojo_browsertest.cc » ('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'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 24 matching lines...) Expand all
35 '../ui/snapshot/snapshot.gyp:*', 35 '../ui/snapshot/snapshot.gyp:*',
36 '../url/url.gyp:*', 36 '../url/url.gyp:*',
37 ], 37 ],
38 'conditions': [ 38 'conditions': [
39 ['OS=="ios"', { 39 ['OS=="ios"', {
40 'dependencies': [ 40 'dependencies': [
41 '../ios/ios.gyp:*', 41 '../ios/ios.gyp:*',
42 # NOTE: This list of targets is present because 42 # NOTE: This list of targets is present because
43 # mojo_base.gyp:mojo_base cannot be built on iOS, as 43 # mojo_base.gyp:mojo_base cannot be built on iOS, as
44 # javascript-related targets cause v8 to be built. 44 # javascript-related targets cause v8 to be built.
45 '../mojo/edk/mojo_edk.gyp:mojo_public_bindings_unittests', 45 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
46 '../mojo/edk/mojo_edk.gyp:mojo_public_environment_unittests', 46 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_environment_unittests',
47 '../mojo/edk/mojo_edk.gyp:mojo_public_system_perftests', 47 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_perftests',
48 '../mojo/edk/mojo_edk.gyp:mojo_public_system_unittests', 48 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_system_unittests',
49 '../mojo/edk/mojo_edk.gyp:mojo_public_utility_unittests', 49 '../mojo/edk/mojo_edk_tests.gyp:mojo_public_utility_unittests',
50 '../mojo/edk/mojo_edk.gyp:mojo_system_impl', 50 '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
51 '../mojo/edk/mojo_edk.gyp:mojo_system_unittests', 51 '../mojo/edk/mojo_edk_tests.gyp:mojo_system_unittests',
52 '../mojo/mojo_base.gyp:mojo_common_lib', 52 '../mojo/mojo_base.gyp:mojo_common_lib',
53 '../mojo/mojo_base.gyp:mojo_common_unittests', 53 '../mojo/mojo_base.gyp:mojo_common_unittests',
54 '../mojo/public/mojo_public.gyp:mojo_cpp_bindings', 54 '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
55 '../mojo/public/mojo_public.gyp:mojo_public_test_utils', 55 '../mojo/public/mojo_public.gyp:mojo_public_test_utils',
56 '../mojo/public/mojo_public.gyp:mojo_system', 56 '../mojo/public/mojo_public.gyp:mojo_system',
57 '../google_apis/google_apis.gyp:google_apis_unittests', 57 '../google_apis/google_apis.gyp:google_apis_unittests',
58 '../ui/base/ui_base_tests.gyp:ui_base_unittests', 58 '../ui/base/ui_base_tests.gyp:ui_base_unittests',
59 '../ui/base/ui_base_tests.gyp:ui_unittests', 59 '../ui/base/ui_base_tests.gyp:ui_unittests',
60 '../ui/ios/ui_ios_tests.gyp:ui_ios_unittests', 60 '../ui/ios/ui_ios_tests.gyp:ui_ios_unittests',
61 '../ui/gfx/gfx_tests.gyp:gfx_unittests', 61 '../ui/gfx/gfx_tests.gyp:gfx_unittests',
(...skipping 1316 matching lines...) Expand 10 before | Expand all | Expand 10 after
1378 'dependencies': [ 1378 'dependencies': [
1379 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1379 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1380 '../ui/views/views.gyp:views', 1380 '../ui/views/views.gyp:views',
1381 '../ui/views/views.gyp:views_unittests', 1381 '../ui/views/views.gyp:views_unittests',
1382 ], 1382 ],
1383 }, # target_name: macviews_builder 1383 }, # target_name: macviews_builder
1384 ], # targets 1384 ], # targets
1385 }], # os=='mac' and toolkit_views==1 1385 }], # os=='mac' and toolkit_views==1
1386 ], # conditions 1386 ], # conditions
1387 } 1387 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/webui/web_ui_mojo_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698