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

Side by Side Diff: mojo/mojo.gyp

Issue 397733003: mojo: kill app_thread before unloading main app library and add tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: less hack Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | mojo/service_manager/service_manager.h » ('j') | mojo/shell/context.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'target_defaults': { 6 'target_defaults': {
7 'conditions': [ 7 'conditions': [
8 ['mojo_shell_debug_url != ""', { 8 ['mojo_shell_debug_url != ""', {
9 'defines': [ 9 'defines': [
10 'MOJO_SHELL_DEBUG=1', 10 'MOJO_SHELL_DEBUG=1',
(...skipping 667 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 ], 678 ],
679 }, 679 },
680 { 680 {
681 'target_name': 'mojo_shell_tests', 681 'target_name': 'mojo_shell_tests',
682 'type': '<(gtest_target_type)', 682 'type': '<(gtest_target_type)',
683 'dependencies': [ 683 'dependencies': [
684 '../base/base.gyp:base', 684 '../base/base.gyp:base',
685 '../base/base.gyp:base_i18n', 685 '../base/base.gyp:base_i18n',
686 '../base/base.gyp:test_support_base', 686 '../base/base.gyp:test_support_base',
687 '../testing/gtest.gyp:gtest', 687 '../testing/gtest.gyp:gtest',
688 '../net/net.gyp:net_test_support',
688 # TODO(vtl): We don't currently need this, but I imagine we will soon. 689 # TODO(vtl): We don't currently need this, but I imagine we will soon.
689 # '../ui/gl/gl.gyp:gl', 690 # '../ui/gl/gl.gyp:gl',
690 '../url/url.gyp:url_lib', 691 '../url/url.gyp:url_lib',
691 'mojo_common_lib', 692 'mojo_common_lib',
692 'mojo_environment_chromium', 693 'mojo_environment_chromium',
693 'mojo_service_manager', 694 'mojo_service_manager',
694 'mojo_shell_lib', 695 'mojo_shell_lib',
695 'mojo_system_impl', 696 'mojo_system_impl',
696 'mojo_test_app', 697 'mojo_test_app',
697 'mojo_test_request_tracker_app', 698 'mojo_test_request_tracker_app',
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
1067 'views/views_init_internal.h', 1068 'views/views_init_internal.h',
1068 ], 1069 ],
1069 'defines': [ 1070 'defines': [
1070 'MOJO_VIEWS_IMPLEMENTATION', 1071 'MOJO_VIEWS_IMPLEMENTATION',
1071 ], 1072 ],
1072 }, 1073 },
1073 ], 1074 ],
1074 }], 1075 }],
1075 ], 1076 ],
1076 } 1077 }
OLDNEW
« no previous file with comments | « no previous file | mojo/service_manager/service_manager.h » ('j') | mojo/shell/context.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698