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

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

Issue 958773002: Fix stale mojom-generated Java problems with gyp builds (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: actually set additional_input_paths correctly -_- Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « build/rmdir_and_stamp.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'actions': [
10 {
11 'variables': {
12 'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
13 'stamp_filename': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/<(_target_na me).stamp',
14 },
15 'action_name': '<(_target_name)_mojom_bindings_stamp',
16 # The java output directory is deleted to ensure that the java library
17 # doesn't try to compile stale files.
18 'action': [
19 'python', '<(DEPTH)/build/rmdir_and_stamp.py',
20 '<(java_out_dir)',
21 '<(stamp_filename)',
22 ],
23 'inputs': [ '<@(_sources)' ],
24 'outputs': [ '<(stamp_filename)' ],
25 }
26 ],
9 'rules': [ 27 'rules': [
10 { 28 {
11 'rule_name': '<(_target_name)_mojom_bindings_generator', 29 'rule_name': '<(_target_name)_mojom_bindings_generator',
12 'extension': 'mojom', 30 'extension': 'mojom',
13 'variables': { 31 'variables': {
14 'mojom_base_output_dir': 32 'mojom_base_output_dir':
15 '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))', 33 '<!(python <(DEPTH)/build/inverse_depth.py <(DEPTH))',
16 'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src', 34 'java_out_dir': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
17 'mojom_import_args%': [ 35 'mojom_import_args%': [
18 '-I<(DEPTH)', 36 '-I<(DEPTH)',
19 '-I<(DEPTH)/third_party/mojo/src' 37 '-I<(DEPTH)/third_party/mojo/src'
20 ], 38 ],
39 'stamp_filename': '<(PRODUCT_DIR)/java_mojo/<(_target_name)/<(_target_na me).stamp',
21 }, 40 },
22 'inputs': [ 41 'inputs': [
23 '<@(mojom_bindings_generator_sources)', 42 '<@(mojom_bindings_generator_sources)',
43 '<(stamp_filename)',
24 ], 44 ],
25 'outputs': [ 45 'outputs': [
26 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT).mojom.cc', 46 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT).mojom.cc',
27 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT).mojom.h', 47 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT).mojom.h',
28 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT).mojom.js', 48 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT).mojom.js',
29 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT)_mojom.py', 49 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT)_mojom.py',
30 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT).mojom-internal.h', 50 '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAM E)/<(RULE_INPUT_ROOT).mojom-internal.h',
31 ], 51 ],
32 'action': [ 52 'action': [
33 'python', '<@(mojom_bindings_generator)', 53 'python', '<@(mojom_bindings_generator)',
(...skipping 18 matching lines...) Expand all
52 'include_dirs': [ 72 'include_dirs': [
53 '<(DEPTH)', 73 '<(DEPTH)',
54 '<(DEPTH)/third_party/mojo/src', 74 '<(DEPTH)/third_party/mojo/src',
55 '<(SHARED_INTERMEDIATE_DIR)', 75 '<(SHARED_INTERMEDIATE_DIR)',
56 '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src', 76 '<(SHARED_INTERMEDIATE_DIR)/third_party/mojo/src',
57 ], 77 ],
58 'variables': { 78 'variables': {
59 'generated_src_dirs': [ 79 'generated_src_dirs': [
60 '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src', 80 '<(PRODUCT_DIR)/java_mojo/<(_target_name)/src',
61 ], 81 ],
82 'additional_input_paths': [
83 '<@(mojom_bindings_generator_sources)',
84 '<@(_sources)',
85 ],
62 }, 86 },
63 }, 87 },
64 'hard_dependency': 1, 88 'hard_dependency': 1,
65 } 89 }
OLDNEW
« no previous file with comments | « build/rmdir_and_stamp.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698