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

Side by Side Diff: mojo/mojo_shell.gyp

Issue 1142323003: Remove duplicate application cpp files in mojo/application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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 | « mojo/mojo_base.gyp ('k') | mojo/runner/BUILD.gn » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 'targets': [{ 6 'targets': [{
7 'target_name': 'mojo_shell_lib', 7 'target_name': 'mojo_shell_lib',
8 'type': 'static_library', 8 'type': 'static_library',
9 'sources': [ 9 'sources': [
10 'shell/application_loader.h', 10 'shell/application_loader.h',
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 'target_name': 'mojo_shell_unittests', 47 'target_name': 'mojo_shell_unittests',
48 'type': 'executable', 48 'type': 'executable',
49 'sources': [ 49 'sources': [
50 'shell/application_manager_unittest.cc', 50 'shell/application_manager_unittest.cc',
51 'shell/query_util_unittest.cc', 51 'shell/query_util_unittest.cc',
52 ], 52 ],
53 'dependencies': [ 53 'dependencies': [
54 '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_lib', 54 '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_lib',
55 '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_test_bindings', 55 '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_test_bindings',
56 '<(DEPTH)/base/base.gyp:base', 56 '<(DEPTH)/base/base.gyp:base',
57 '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_chromium', 57 '<(DEPTH)/mojo/mojo_base.gyp:mojo_application_base',
58 '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib', 58 '<(DEPTH)/mojo/mojo_base.gyp:mojo_common_lib',
59 '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium', 59 '<(DEPTH)/mojo/mojo_base.gyp:mojo_environment_chromium',
60 '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters', 60 '<(DEPTH)/mojo/mojo_base.gyp:mojo_url_type_converters',
61 '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests', 61 '<(DEPTH)/third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
62 '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_application_base', 62 '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_application_base',
63 '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 63 '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
64 '<(DEPTH)/testing/gtest.gyp:gtest', 64 '<(DEPTH)/testing/gtest.gyp:gtest',
65 '<(DEPTH)/url/url.gyp:url_lib', 65 '<(DEPTH)/url/url.gyp:url_lib',
66 ] 66 ]
67 }, { 67 }, {
68 'target_name': 'mojo_shell_test_bindings', 68 'target_name': 'mojo_shell_test_bindings',
69 'type': 'static_library', 69 'type': 'static_library',
70 'variables': { 70 'variables': {
71 'mojom_files': [ 71 'mojom_files': [
72 'shell/test.mojom', 72 'shell/test.mojom',
73 ], 73 ],
74 }, 74 },
75 'includes': [ 75 'includes': [
76 '../third_party/mojo/mojom_bindings_generator_explicit.gypi', 76 '../third_party/mojo/mojom_bindings_generator_explicit.gypi',
77 ], 77 ],
78 }], 78 }],
79 } 79 }
OLDNEW
« no previous file with comments | « mojo/mojo_base.gyp ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698