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

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

Issue 265393003: Move modules-related attributes out from Window.idl. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove unnecessary code changes in the previous patch. Created 6 years, 7 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/modules/mediastream/WindowMediaStream.idl ('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 # 1 #
2 # Copyright (C) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 12 matching lines...) Expand all
23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 # 29 #
30 { 30 {
31 'includes': [ 31 'includes': [
32 '../build/win/precompile.gypi', 32 '../build/win/precompile.gypi',
33 '../bindings/bindings.gypi',
33 'modules.gypi', 34 'modules.gypi',
34 ], 35 ],
35 'targets': [{ 36 'targets': [{
36 'target_name': 'modules', 37 'target_name': 'modules',
37 'type': 'static_library', 38 'type': 'static_library',
38 'dependencies': [ 39 'dependencies': [
39 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', 40 '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
40 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', 41 '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
41 '../config.gyp:config', 42 '../config.gyp:config',
42 '../core/core.gyp:webcore', 43 '../core/core.gyp:webcore',
43 ], 44 ],
44 'defines': [ 45 'defines': [
45 'BLINK_IMPLEMENTATION=1', 46 'BLINK_IMPLEMENTATION=1',
46 'INSIDE_BLINK', 47 'INSIDE_BLINK',
47 ], 48 ],
48 'sources': [ 49 'sources': [
49 '<@(modules_files)', 50 '<@(modules_files)',
51 '<@(bindings_modules_generated_aggregate_files)',
50 ], 52 ],
51 # Disable c4267 warnings until we fix size_t to int truncations. 53 # Disable c4267 warnings until we fix size_t to int truncations.
52 'msvs_disabled_warnings': [ 4267, 4334, ] 54 'msvs_disabled_warnings': [ 4267, 4334, ]
53 }, 55 },
54 { 56 {
55 'target_name': 'modules_testing', 57 'target_name': 'modules_testing',
56 'type': 'static_library', 58 'type': 'static_library',
57 'dependencies': [ 59 'dependencies': [
58 '../config.gyp:config', 60 '../config.gyp:config',
59 '../core/core.gyp:webcore', 61 '../core/core.gyp:webcore',
60 ], 62 ],
61 'defines': [ 63 'defines': [
62 'BLINK_IMPLEMENTATION=1', 64 'BLINK_IMPLEMENTATION=1',
63 'INSIDE_BLINK', 65 'INSIDE_BLINK',
64 ], 66 ],
65 'sources': [ 67 'sources': [
66 '<@(modules_testing_files)', 68 '<@(modules_testing_files)',
67 ], 69 ],
68 70
69 }], 71 }],
70 } 72 }
OLDNEW
« no previous file with comments | « Source/modules/mediastream/WindowMediaStream.idl ('k') | Source/modules/modules.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698