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

Unified Diff: mojo/mojo_public.gypi

Issue 259823005: Add GN targets for mojom generator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
Index: mojo/mojo_public.gypi
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 7f9c2f7c163b7c3b060ba8a017dad50f246e77a2..8f124e720802c2e8c7fcd1722678ea3beedcfc0e 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -117,7 +117,7 @@
'type': 'executable',
'dependencies': [
'../testing/gtest.gyp:gtest',
- 'mojo_bindings',
+ 'mojo_cpp_bindings',
'mojo_environment_standalone',
'mojo_public_test_utils',
'mojo_run_all_unittests',
@@ -157,7 +157,7 @@
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
- 'mojo_bindings',
+ 'mojo_cpp_bindings',
'mojo_public_test_utils',
'mojo_run_all_unittests',
],
@@ -175,7 +175,7 @@
'dependencies': [
'../base/base.gyp:base',
'../testing/gtest.gyp:gtest',
- 'mojo_bindings',
+ 'mojo_cpp_bindings',
'mojo_public_test_utils',
'mojo_run_all_unittests',
'mojo_utility',
@@ -210,7 +210,7 @@
],
},
{
- 'target_name': 'mojo_bindings',
+ 'target_name': 'mojo_cpp_bindings',
'type': 'static_library',
'include_dirs': [
'..'
@@ -253,6 +253,15 @@
'public/cpp/bindings/lib/shared_data.h',
'public/cpp/bindings/lib/shared_ptr.h',
'public/cpp/bindings/lib/sync_dispatcher.cc',
+ ],
+ },
+ {
+ 'target_name': 'mojo_js_bindings',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '..'
+ ],
+ 'sources': [
'public/js/bindings/constants.cc',
'public/js/bindings/constants.h',
],
@@ -274,10 +283,10 @@
},
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
- 'mojo_bindings',
+ 'mojo_cpp_bindings',
],
'dependencies': [
- 'mojo_bindings',
+ 'mojo_cpp_bindings',
],
},
{
@@ -337,10 +346,10 @@
},
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'dependencies': [
- 'mojo_bindings',
+ 'mojo_cpp_bindings',
],
'export_dependent_settings': [
- 'mojo_bindings',
+ 'mojo_cpp_bindings',
],
},
{

Powered by Google App Engine
This is Rietveld 408576698