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

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

Issue 459843002: DevTools: Fix bad devtools.gyp merge from r179948 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | 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 # 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 '<(PRODUCT_DIR)/resources/inspector', 125 '<(PRODUCT_DIR)/resources/inspector',
126 'front_end' 126 'front_end'
127 ], 127 ],
128 'input_pages': [ 128 'input_pages': [
129 '<(PRODUCT_DIR)/resources/inspector/devtools.html', 129 '<(PRODUCT_DIR)/resources/inspector/devtools.html',
130 '<(PRODUCT_DIR)/resources/inspector/inspector.css', 130 '<(PRODUCT_DIR)/resources/inspector/inspector.css',
131 '<(PRODUCT_DIR)/resources/inspector/main/Main.js', 131 '<(PRODUCT_DIR)/resources/inspector/main/Main.js',
132 '<(PRODUCT_DIR)/resources/inspector/audits/_module.j s', 132 '<(PRODUCT_DIR)/resources/inspector/audits/_module.j s',
133 '<(PRODUCT_DIR)/resources/inspector/console/_module. js', 133 '<(PRODUCT_DIR)/resources/inspector/console/_module. js',
134 '<(PRODUCT_DIR)/resources/inspector/devices/_module. js', 134 '<(PRODUCT_DIR)/resources/inspector/devices/_module. js',
135 '<(PRODUCT_DIR)/resources/inspector/documentation/_m odule.js',
135 '<(PRODUCT_DIR)/resources/inspector/elements/_module .js', 136 '<(PRODUCT_DIR)/resources/inspector/elements/_module .js',
136 '<(PRODUCT_DIR)/resources/inspector/extensions/_modu le.js', 137 '<(PRODUCT_DIR)/resources/inspector/extensions/_modu le.js',
137 '<(PRODUCT_DIR)/resources/inspector/layers/_module.j s', 138 '<(PRODUCT_DIR)/resources/inspector/layers/_module.j s',
138 '<(PRODUCT_DIR)/resources/inspector/network/_module. js', 139 '<(PRODUCT_DIR)/resources/inspector/network/_module. js',
139 '<(PRODUCT_DIR)/resources/inspector/profiler/_module .js', 140 '<(PRODUCT_DIR)/resources/inspector/profiler/_module .js',
140 '<(PRODUCT_DIR)/resources/inspector/resources/_modul e.js', 141 '<(PRODUCT_DIR)/resources/inspector/resources/_modul e.js',
141 '<(PRODUCT_DIR)/resources/inspector/settings/_module .js', 142 '<(PRODUCT_DIR)/resources/inspector/settings/_module .js',
142 '<(PRODUCT_DIR)/resources/inspector/source_frame/_mo dule.js', 143 '<(PRODUCT_DIR)/resources/inspector/source_frame/_mo dule.js',
143 '<(PRODUCT_DIR)/resources/inspector/sources/_module. js', 144 '<(PRODUCT_DIR)/resources/inspector/sources/_module. js',
144 '<(PRODUCT_DIR)/resources/inspector/timeline/_module .js', 145 '<(PRODUCT_DIR)/resources/inspector/timeline/_module .js',
145 '<(PRODUCT_DIR)/resources/inspector/heap_snapshot_wo rker/_module.js', 146 '<(PRODUCT_DIR)/resources/inspector/heap_snapshot_wo rker/_module.js',
146 '<(PRODUCT_DIR)/resources/inspector/script_formatter _worker/_module.js', 147 '<(PRODUCT_DIR)/resources/inspector/script_formatter _worker/_module.js',
147 '<(PRODUCT_DIR)/resources/inspector/temp_storage_sha red_worker/_module.js', 148 '<(PRODUCT_DIR)/resources/inspector/temp_storage_sha red_worker/_module.js',
148 '<(PRODUCT_DIR)/resources/inspector/devtools_extensi on_api.js', 149 '<(PRODUCT_DIR)/resources/inspector/devtools_extensi on_api.js',
149 '<(PRODUCT_DIR)/resources/inspector/documentation/Do cumentationView.js',
150 '<@(devtools_standalone_files)', 150 '<@(devtools_standalone_files)',
151 '<@(devtools_cm_css_files)', 151 '<@(devtools_cm_css_files)',
152 ], 152 ],
153 'images': [ 153 'images': [
154 '<@(devtools_image_files)', 154 '<@(devtools_image_files)',
155 ], 155 ],
156 'inputs': [ 156 'inputs': [
157 '<@(_script_name)', 157 '<@(_script_name)',
158 '<@(_input_pages)', 158 '<@(_input_pages)',
159 '<@(_images)', 159 '<@(_images)',
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 '<@(devtools_module_json_files)', 922 '<@(devtools_module_json_files)',
923 ], 923 ],
924 'outputs': ['<(blink_devtools_output_dir)/common/modules .js'], 924 'outputs': ['<(blink_devtools_output_dir)/common/modules .js'],
925 'action': ['python', '<@(_script_name)', '<@(_input_file )', '<@(_outputs)', '<@(devtools_module_json_files)'], 925 'action': ['python', '<@(_script_name)', '<@(_input_file )', '<@(_outputs)', '<@(devtools_module_json_files)'],
926 }], 926 }],
927 }, 927 },
928 ], 928 ],
929 }], 929 }],
930 ], # conditions 930 ], # conditions
931 } 931 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698