Dartium Roll 38 roll

bindings/scripts/aggregate_generated_bindings.py

 #!/usr/bin/python
 #
 # Copyright (C) 2009 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 102 matching lines @@
 
 def extract_conditional(idl_file_path):
     """Find [Conditional] interface extended attribute."""
     with open(idl_file_path) as idl_file:
         idl_contents = idl_file.read()
 
     match = CONDITIONAL_PATTERN.search(idl_contents)
     if not match:
         return None
     conditional = match.group(1)
-    return re.split('([|&])', conditional)
+    return re.split('([|,])', conditional)
 
 
 def extract_meta_data(file_paths):
     """Extracts conditional and interface name from each IDL file."""
     meta_data_list = []
 
     for file_path in file_paths:
         if not file_path.endswith('.idl'):
             print 'WARNING: non-IDL file passed: "%s"' % file_path
             continue
@@ skipping 93 matching lines @@
                 meta_data for meta_data in files_meta_data
                 if hash(meta_data['name']) % total_partitions == partition]
         file_contents = generate_content(component_dir,
                                          files_meta_data_this_partition,
                                          prefix)
         write_content(file_contents, file_name)
 
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))