| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # | 2 # |
| 3 # Copyright 2014 The Chromium Authors. All rights reserved. | 3 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 """ | 7 """ |
| 8 Utilities for the modular DevTools build. | 8 Utilities for the modular DevTools build. |
| 9 """ | 9 """ |
| 10 | 10 |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 | 181 |
| 182 return Descriptors(self.application_dir, merged_application_descriptor,
all_module_descriptors, has_html) | 182 return Descriptors(self.application_dir, merged_application_descriptor,
all_module_descriptors, has_html) |
| 183 | 183 |
| 184 def _read_module_descriptor(self, module_name, application_descriptor_filena
me): | 184 def _read_module_descriptor(self, module_name, application_descriptor_filena
me): |
| 185 json_filename = path.join(self.application_dir, module_name, 'module.jso
n') | 185 json_filename = path.join(self.application_dir, module_name, 'module.jso
n') |
| 186 if not path.exists(json_filename): | 186 if not path.exists(json_filename): |
| 187 bail_error('Module descriptor %s referenced in %s is missing' % (jso
n_filename, application_descriptor_filename)) | 187 bail_error('Module descriptor %s referenced in %s is missing' % (jso
n_filename, application_descriptor_filename)) |
| 188 module_json = load_and_parse_json(json_filename) | 188 module_json = load_and_parse_json(json_filename) |
| 189 module_json['name'] = module_name | 189 module_json['name'] = module_name |
| 190 return module_json | 190 return module_json |
| OLD | NEW |