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

Side by Side Diff: third_party/mojo/mojom_bindings_generator_explicit.gypi

Issue 1435063002: Eliminate third_party/mojo/src from all targets' include paths (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 unified diff | Download patch
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 'includes': [ 6 'includes': [
7 'mojom_bindings_generator_variables.gypi', 7 'mojom_bindings_generator_variables.gypi',
8 ], 8 ],
9 'variables': { 9 'variables': {
10 'mojom_base_output_dir': 10 'mojom_base_output_dir':
(...skipping 26 matching lines...) Expand all
37 'outputs': [ '<(stamp_filename)' ], 37 'outputs': [ '<(stamp_filename)' ],
38 }, 38 },
39 { 39 {
40 'action_name': '<(_target_name)_mojom_bindings_generator', 40 'action_name': '<(_target_name)_mojom_bindings_generator',
41 'variables': { 41 'variables': {
42 'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src', 42 'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
43 'stamp_filename': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/<(_target_na me).stamp', 43 'stamp_filename': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/<(_target_na me).stamp',
44 'mojom_import_args%': [ 44 'mojom_import_args%': [
45 '-I<(DEPTH)', 45 '-I<(DEPTH)',
46 '-I<(DEPTH)/mojo/services', 46 '-I<(DEPTH)/mojo/services',
47 '-I<(DEPTH)/third_party/mojo/src',
48 '-I<(mojom_include_path)', 47 '-I<(mojom_include_path)',
49 ], 48 ],
50 }, 49 },
51 'inputs': [ 50 'inputs': [
52 '<@(mojom_bindings_generator_sources)', 51 '<@(mojom_bindings_generator_sources)',
53 '<@(mojom_files)', 52 '<@(mojom_files)',
54 '<(stamp_filename)', 53 '<(stamp_filename)',
55 ], 54 ],
56 'outputs': [ 55 'outputs': [
57 '<@(mojom_generated_outputs)', 56 '<@(mojom_generated_outputs)',
(...skipping 25 matching lines...) Expand all
83 'hard_dependency': '1', 82 'hard_dependency': '1',
84 'direct_dependent_settings': { 83 'direct_dependent_settings': {
85 # A target directly depending on this action will compile the generated 84 # A target directly depending on this action will compile the generated
86 # sources. 85 # sources.
87 'sources': [ 86 'sources': [
88 '<@(mojom_generated_outputs)', 87 '<@(mojom_generated_outputs)',
89 ], 88 ],
90 # Include paths needed to compile the generated sources into a library. 89 # Include paths needed to compile the generated sources into a library.
91 'include_dirs': [ 90 'include_dirs': [
92 '<(DEPTH)', 91 '<(DEPTH)',
93 '<(DEPTH)/third_party/mojo/src',
94 '<(SHARED_INTERMEDIATE_DIR)', 92 '<(SHARED_INTERMEDIATE_DIR)',
95 '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
96 ], 93 ],
97 # Make sure the generated header files are available for any static library 94 # Make sure the generated header files are available for any static library
98 # that depends on a static library that depends on this generator. 95 # that depends on a static library that depends on this generator.
99 'hard_dependency': 1, 96 'hard_dependency': 1,
100 'direct_dependent_settings': { 97 'direct_dependent_settings': {
101 # Include paths needed to find the generated header files and their 98 # Include paths needed to find the generated header files and their
102 # transitive dependancies when using the library. 99 # transitive dependancies when using the library.
103 'include_dirs': [ 100 'include_dirs': [
104 '<(DEPTH)', 101 '<(DEPTH)',
105 '<(DEPTH)/third_party/mojo/src',
106 '<(SHARED_INTERMEDIATE_DIR)', 102 '<(SHARED_INTERMEDIATE_DIR)',
107 '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
108 ], 103 ],
109 'variables': { 104 'variables': {
110 'generated_src_dirs': [ 105 'generated_src_dirs': [
111 '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src', 106 '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
112 ], 107 ],
113 'additional_input_paths': [ 108 'additional_input_paths': [
114 '<@(mojom_bindings_generator_sources)', 109 '<@(mojom_bindings_generator_sources)',
115 '<@(mojom_files)', 110 '<@(mojom_files)',
116 ], 111 ],
117 'mojom_generated_sources': [ '<@(mojom_generated_outputs)' ], 112 'mojom_generated_sources': [ '<@(mojom_generated_outputs)' ],
118 }, 113 },
119 } 114 }
120 }, 115 },
121 } 116 }
OLDNEW
« no previous file with comments | « third_party/mojo/mojom_bindings_generator.gypi ('k') | third_party/mojo/src/mojo/edk/embedder/embedder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698