DevTools: Log non-well-formed JSON file name when compiling frontend

Source/devtools/scripts/modular_build.py

 #!/usr/bin/env python
 #
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Utilities for the modular DevTools build.
 """
 
@@ skipping 15 matching lines @@
     if path.exists(filename):
         os.remove(filename)
     with open(filename, 'wt') as output:
         output.write(content)
 
 
 def bail_error(message):
     raise Exception(message)
 
 
+def load_and_parse_json(filename):
+    try:
+        return json.loads(read_file(filename))
+    except:
+        print 'ERROR: Failed to parse %s' % filename
+        raise
+
+
 def concatenate_scripts(file_names, module_dir, output_dir, output):
     for file_name in file_names:
         output.write('/* %s */\n' % file_name)
         file_path = path.join(module_dir, file_name)
         if not path.isfile(file_path):
             file_path = path.join(output_dir, path.basename(module_dir), file_name)
         output.write(read_file(file_path))
         output.write(';')
 
 
@@ skipping 90 matching lines @@
 
     def load_application(self, application_descriptor_name):
         return self.load_applications([application_descriptor_name])
 
     def load_applications(self, application_descriptor_names):
         merged_application_descriptor = {}
         all_module_descriptors = {}
         for application_descriptor_name in application_descriptor_names:
             module_descriptors = {}
             application_descriptor_filename = path.join(self.application_dir, application_descriptor_name)
-            application_descriptor_json = read_file(application_descriptor_filename)
-            application_descriptor = {desc['name']: desc for desc in json.loads(application_descriptor_json)}
+            application_descriptor = {desc['name']: desc for desc in load_and_parse_json(application_descriptor_filename)}
+
             for name in application_descriptor:
                 merged_application_descriptor[name] = application_descriptor[name]
 
             for (module_name, module) in application_descriptor.items():
                 if module_descriptors.get(module_name):
                     bail_error('Duplicate definition of module "%s" in %s' % (module_name, application_descriptor_filename))
                 if not all_module_descriptors.get(module_name):
                     module_descriptors[module_name] = self._read_module_descriptor(module_name, application_descriptor_filename)
                     all_module_descriptors[module_name] = module_descriptors[module_name]
 
             for module in module_descriptors.values():
                 deps = module.get('dependencies', [])
                 for dep in deps:
                     if dep not in application_descriptor:
                         bail_error('Module "%s" (dependency of "%s") not listed in application descriptor %s' % (dep, module['name'], application_descriptor_filename))
 
         return Descriptors(self.application_dir, merged_application_descriptor, all_module_descriptors)
 
     def _read_module_descriptor(self, module_name, application_descriptor_filename):
         json_filename = path.join(self.application_dir, module_name, 'module.json')
         if not path.exists(json_filename):
             bail_error('Module descriptor %s referenced in %s is missing' % (json_filename, application_descriptor_filename))
-        module_json = json.loads(read_file(json_filename))
+        module_json = load_and_parse_json(json_filename)
         module_json['name'] = module_name
         return module_json