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

Unified Diff: mojo/mojo_base.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/application/public/cpp/tests/BUILD.gn ('k') | mojo/mojo_shell.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_base.gyp
diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp
index 35bb40211dd201a0a3609b2796a8b39a50afc003..b99b0197a7f2d5ea06e8ba1cb7ab0e9c95faf429 100644
--- a/mojo/mojo_base.gyp
+++ b/mojo/mojo_base.gyp
@@ -174,23 +174,6 @@
},
},
{
- # GN version: //mojo/application
- 'target_name': 'mojo_application_chromium',
- 'type': 'static_library',
- 'sources': [
- 'application/application_runner_chromium.cc',
- 'application/application_runner_chromium.h',
- ],
- 'dependencies': [
- 'mojo_application_base',
- 'mojo_common_lib',
- 'mojo_environment_chromium',
- ],
- 'export_dependent_settings': [
- 'mojo_application_base',
- ],
- },
- {
'target_name': 'mojo_application_bindings_mojom',
'type': 'none',
'variables': {
@@ -207,15 +190,19 @@
'target_name': 'mojo_application_base',
'type': 'static_library',
'sources': [
+ 'application/public/cpp/app_lifetime_helper.h',
'application/public/cpp/application_connection.h',
'application/public/cpp/application_delegate.h',
'application/public/cpp/application_impl.h',
+ 'application/public/cpp/application_runner.h',
'application/public/cpp/connect.h',
'application/public/cpp/interface_factory.h',
'application/public/cpp/interface_factory_impl.h',
+ 'application/public/cpp/lib/app_lifetime_helper.cc',
'application/public/cpp/lib/application_connection.cc',
'application/public/cpp/lib/application_delegate.cc',
'application/public/cpp/lib/application_impl.cc',
+ 'application/public/cpp/lib/application_runner.cc',
'application/public/cpp/lib/interface_factory_connector.h',
'application/public/cpp/lib/service_connector_registry.cc',
'application/public/cpp/lib/service_connector_registry.h',
@@ -233,22 +220,6 @@
],
},
{
- # GN version: //mojo/application/public/cpp:standalone
- 'target_name': 'mojo_application_standalone',
- 'type': 'static_library',
- 'sources': [
- 'application/public/cpp/lib/application_runner.cc',
- 'application/public/cpp/application_runner.h',
- ],
- 'dependencies': [
- 'mojo_application_base',
- '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
- ],
- 'export_dependent_settings': [
- 'mojo_application_base',
- ],
- },
- {
# GN version: //mojo/public/interfaces/application:application
'target_name': 'mojo_application_bindings',
'type': 'static_library',
@@ -265,7 +236,7 @@
'target_name': 'mojo_public_application_unittests',
'type': 'executable',
'dependencies': [
- 'mojo_application_standalone',
+ 'mojo_application_base',
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
'../third_party/mojo/mojo_edk.gyp:mojo_run_all_unittests',
« no previous file with comments | « mojo/application/public/cpp/tests/BUILD.gn ('k') | mojo/mojo_shell.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698