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

Side by Side Diff: Source/modules/modules.gni

Issue 547383004: WebMIDI: Add MIDIOptions dictionary (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add assertion Created 6 years, 3 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 | « Source/bindings/modules/v8/generated.gyp ('k') | Source/modules/modules.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # This file is gn GN version of modules.gypi. 5 # This file is gn GN version of modules.gypi.
6 6
7 blink_modules_output_dir = "$root_gen_dir/blink/modules" 7 blink_modules_output_dir = "$root_gen_dir/blink/modules"
8 8
9 _gypi = exec_script( 9 _gypi = exec_script(
10 "//build/gypi_to_gn.py", 10 "//build/gypi_to_gn.py",
11 [ rebase_path("modules.gypi"), 11 [ rebase_path("modules.gypi"),
12 "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir", 12 "--replace=<(SHARED_INTERMEDIATE_DIR)=$root_gen_dir",
13 "--replace=<(blink_modules_output_dir)=$blink_modules_output_dir" ], 13 "--replace=<(blink_modules_output_dir)=$blink_modules_output_dir" ],
14 "scope", 14 "scope",
15 [ "modules.gypi" ]) 15 [ "modules.gypi" ])
16 16
17 _tmp_modules_idl_files = _gypi.modules_idl_files 17 _tmp_modules_idl_files = _gypi.modules_idl_files
18 # modules_idl_files has a magic variable in it that is an embedder hook, 18 # modules_idl_files has a magic variable in it that is an embedder hook,
19 # remove that since it's not a file (need to do this before rebasing). 19 # remove that since it's not a file (need to do this before rebasing).
20 _tmp_modules_idl_files -= [ 20 _tmp_modules_idl_files -= [
21 "<@(extra_blink_module_idl_files)", 21 "<@(extra_blink_module_idl_files)",
22 ] 22 ]
23 modules_idl_files = get_path_info(_tmp_modules_idl_files, "abspath") 23 modules_idl_files = get_path_info(_tmp_modules_idl_files, "abspath")
24 24
25 modules_dictionary_idl_files =
26 get_path_info(_gypi.modules_dictionary_idl_files, "abspath")
27
25 # 'partial interface' or target (right side of) 'implements' 28 # 'partial interface' or target (right side of) 'implements'
26 modules_dependency_idl_files = 29 modules_dependency_idl_files =
27 get_path_info(_gypi.modules_dependency_idl_files, "abspath") 30 get_path_info(_gypi.modules_dependency_idl_files, "abspath")
28 31
29 modules_event_idl_files = 32 modules_event_idl_files =
30 get_path_info(_gypi.modules_event_idl_files, "abspath") 33 get_path_info(_gypi.modules_event_idl_files, "abspath")
31 34
32 # interfaces that inherit from Event 35 # interfaces that inherit from Event
33 generated_modules_files = 36 generated_modules_files =
34 get_path_info(_gypi.generated_modules_files, "abspath") 37 get_path_info(_gypi.generated_modules_files, "abspath")
35 38
39 generated_modules_dictionary_files =
40 get_path_info(_gypi.generated_modules_dictionary_files, "abspath")
41
36 # Remove GYP variables from the list (need to do this before rebasing). 42 # Remove GYP variables from the list (need to do this before rebasing).
37 _tmp_modules_files = _gypi.modules_files 43 _tmp_modules_files = _gypi.modules_files
38 _tmp_modules_files -= [ 44 _tmp_modules_files -= [
39 "<@(extra_blink_module_files)", 45 "<@(extra_blink_module_files)",
46 "<@(generated_modules_dictionary_files)",
40 "<@(generated_modules_files)", 47 "<@(generated_modules_files)",
41 ] 48 ]
42 modules_files = get_path_info(_tmp_modules_files, "abspath") 49 modules_files = get_path_info(_tmp_modules_files, "abspath")
43 modules_files += generated_modules_files # Account for GYP var expansion. 50 # Account for GYP var expansion.
51 modules_files += generated_modules_files + generated_modules_dictionary_files
44 52
45 # 'partial interface' or target (right side of) 'implements' 53 # 'partial interface' or target (right side of) 'implements'
46 modules_testing_dependency_idl_files = 54 modules_testing_dependency_idl_files =
47 get_path_info(_gypi.modules_testing_dependency_idl_files, "abspath") 55 get_path_info(_gypi.modules_testing_dependency_idl_files, "abspath")
48 56
49 modules_testing_files = get_path_info(_gypi.modules_testing_files, "abspath") 57 modules_testing_files = get_path_info(_gypi.modules_testing_files, "abspath")
50 modules_unittest_files = get_path_info(_gypi.modules_unittest_files, "abspath") 58 modules_unittest_files = get_path_info(_gypi.modules_unittest_files, "abspath")
OLDNEW
« no previous file with comments | « Source/bindings/modules/v8/generated.gyp ('k') | Source/modules/modules.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698