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

Unified Diff: mojo/mojo_apps.gypi

Issue 632853002: Define gyp targets for mojo/public/* in mojo/public/mojo_public.gyp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ios fixes Created 6 years, 2 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/mojo.gyp ('k') | mojo/mojo_base.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_apps.gypi
diff --git a/mojo/mojo_apps.gypi b/mojo/mojo_apps.gypi
index ea597e306b9549b59f7929ca6acc6ad6a4d42fc2..57c8362e222c2a0990ca448df0d07bf2f51ad8e3 100644
--- a/mojo/mojo_apps.gypi
+++ b/mojo/mojo_apps.gypi
@@ -54,10 +54,10 @@
],
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_base.gyp:mojo_cpp_bindings',
+ 'public/mojo_public.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_base.gyp:mojo_cpp_bindings',
+ 'public/mojo_public.gyp:mojo_cpp_bindings',
],
},
{
@@ -66,12 +66,12 @@
'type': 'executable',
'dependencies': [
'../gin/gin.gyp:gin_test',
+ 'mojo_apps_js_bindings',
'mojo_base.gyp:mojo_common_lib',
'mojo_base.gyp:mojo_common_test_support',
- 'mojo_base.gyp:mojo_public_test_interfaces',
'mojo_base.gyp:mojo_run_all_unittests',
- 'mojo_apps_js_bindings',
'mojo_js_lib',
+ 'public/mojo_public.gyp:mojo_public_test_interfaces',
],
'sources': [
'apps/js/test/handle_unittest.cc',
@@ -84,14 +84,14 @@
'target_name': 'mojo_js_apps_lib',
'type': 'static_library',
'export_dependent_settings': [
- 'mojo_base.gyp:mojo_cpp_bindings',
+ 'public/mojo_public.gyp:mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_base.gyp:mojo_application_chromium',
'mojo_apps_js_bindings',
- 'mojo_base.gyp:mojo_cpp_bindings',
- 'mojo_base.gyp:mojo_utility',
+ 'mojo_base.gyp:mojo_application_chromium',
'mojo_js_lib',
+ 'public/mojo_public.gyp:mojo_cpp_bindings',
+ 'public/mojo_public.gyp:mojo_utility',
],
'sources': [
'apps/js/application_delegate_impl.cc',
« no previous file with comments | « mojo/mojo.gyp ('k') | mojo/mojo_base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698