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

Unified Diff: mojo/mojom_bindings_generator_explicit.gypi

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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/mojom_bindings_generator_explicit.gypi
diff --git a/third_party/mojo/mojom_bindings_generator_explicit.gypi b/mojo/mojom_bindings_generator_explicit.gypi
similarity index 88%
rename from third_party/mojo/mojom_bindings_generator_explicit.gypi
rename to mojo/mojom_bindings_generator_explicit.gypi
index 8df48aa54114f2faabceca1543d9f7f114633bbe..029f918f4cb28f0f9cdd621b91b2eb743b4b3cf2 100644
--- a/third_party/mojo/mojom_bindings_generator_explicit.gypi
+++ b/mojo/mojom_bindings_generator_explicit.gypi
@@ -10,7 +10,7 @@
'mojom_base_output_dir':
'<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
'mojom_generated_outputs': [
- '<!@(python <(DEPTH)/third_party/mojo/src/mojo/public/tools/bindings/mojom_list_outputs.py --basedir <(mojom_base_output_dir) <@(mojom_files))',
+ '<!@(python <(DEPTH)/mojo/public/tools/bindings/mojom_list_outputs.py --basedir <(mojom_base_output_dir) <@(mojom_files))',
],
'mojom_include_path%': '<(DEPTH)',
'require_interface_bindings%': 1,
@@ -44,7 +44,6 @@
'mojom_import_args%': [
'-I<(DEPTH)',
'-I<(DEPTH)/mojo/services',
- '-I<(DEPTH)/third_party/mojo/src',
'-I<(mojom_include_path)',
],
},
@@ -72,7 +71,7 @@
['require_interface_bindings==1', {
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_interface_bindings_generation',
+ '<(DEPTH)/mojo/mojo_public.gyp:mojo_interface_bindings_generation',
],
}],
],
@@ -90,9 +89,7 @@
# Include paths needed to compile the generated sources into a library.
'include_dirs': [
'<(DEPTH)',
- '<(DEPTH)/third_party/mojo/src',
'<(SHARED_INTERMEDIATE_DIR)',
- '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
],
# Make sure the generated header files are available for any static library
# that depends on a static library that depends on this generator.
@@ -102,9 +99,7 @@
# transitive dependancies when using the library.
'include_dirs': [
'<(DEPTH)',
- '<(DEPTH)/third_party/mojo/src',
'<(SHARED_INTERMEDIATE_DIR)',
- '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
],
'variables': {
'generated_src_dirs': [

Powered by Google App Engine
This is Rietveld 408576698