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

Side by Side Diff: build/all.gyp

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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 | « .gitignore ('k') | chrome/DEPS » ('j') | chrome/browser/BUILD.gn » ('J')
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 '../mojo/mojo_base.gyp:mojo_common_lib', 56 '../mojo/mojo_base.gyp:mojo_common_lib',
57 '../mojo/mojo_base.gyp:mojo_common_unittests', 57 '../mojo/mojo_base.gyp:mojo_common_unittests',
58 '../google_apis/google_apis.gyp:google_apis_unittests', 58 '../google_apis/google_apis.gyp:google_apis_unittests',
59 '../skia/skia_tests.gyp:skia_unittests', 59 '../skia/skia_tests.gyp:skia_unittests',
60 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 60 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
61 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittes ts', 61 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittes ts',
62 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unit tests', 62 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unit tests',
63 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests ', 63 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests ',
64 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittest s', 64 '../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittest s',
65 '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests', 65 '../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests',
66 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 66 '../mojo/mojo_public.gyp:mojo_cpp_bindings',
67 '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils', 67 '../mojo/mojo_public.gyp:mojo_public_test_utils',
68 '../third_party/mojo/mojo_public.gyp:mojo_system', 68 '../mojo/mojo_public.gyp:mojo_system',
jam 2015/11/11 17:59:42 nit: order
69 '../ui/base/ui_base_tests.gyp:ui_base_unittests', 69 '../ui/base/ui_base_tests.gyp:ui_base_unittests',
70 '../ui/gfx/gfx_tests.gyp:gfx_unittests', 70 '../ui/gfx/gfx_tests.gyp:gfx_unittests',
71 ], 71 ],
72 }], 72 }],
73 ['OS=="android"', { 73 ['OS=="android"', {
74 'dependencies': [ 74 'dependencies': [
75 '../content/content_shell_and_tests.gyp:content_shell_apk', 75 '../content/content_shell_and_tests.gyp:content_shell_apk',
76 '<@(android_app_targets)', 76 '<@(android_app_targets)',
77 'android_builder_tests', 77 'android_builder_tests',
78 '../tools/telemetry/telemetry.gyp:*#host', 78 '../tools/telemetry/telemetry.gyp:*#host',
(...skipping 1354 matching lines...) Expand 10 before | Expand all | Expand 10 after
1433 'dependencies': [ 1433 'dependencies': [
1434 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1434 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1435 '../ui/views/views.gyp:views', 1435 '../ui/views/views.gyp:views',
1436 '../ui/views/views.gyp:views_unittests', 1436 '../ui/views/views.gyp:views_unittests',
1437 ], 1437 ],
1438 }, # target_name: macviews_builder 1438 }, # target_name: macviews_builder
1439 ], # targets 1439 ], # targets
1440 }], # os=='mac' and toolkit_views==1 1440 }], # os=='mac' and toolkit_views==1
1441 ], # conditions 1441 ], # conditions
1442 } 1442 }
OLDNEW
« no previous file with comments | « .gitignore ('k') | chrome/DEPS » ('j') | chrome/browser/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698