| OLD | NEW |
| 1 # Copyright (C) 2013 Google Inc. All rights reserved. | 1 # Copyright (C) 2013 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 'ImplementedAs', dependency_interface_basename)) | 170 'ImplementedAs', dependency_interface_basename)) |
| 171 | 171 |
| 172 def merge_lists(source_list, target_list): | 172 def merge_lists(source_list, target_list): |
| 173 for member in source_list: | 173 for member in source_list: |
| 174 member.extended_attributes.update(merged_extended_attributes) | 174 member.extended_attributes.update(merged_extended_attributes) |
| 175 target_list.extend(source_list) | 175 target_list.extend(source_list) |
| 176 | 176 |
| 177 merge_lists(dependency_interface.attributes, target_interface.attributes) | 177 merge_lists(dependency_interface.attributes, target_interface.attributes) |
| 178 merge_lists(dependency_interface.constants, target_interface.constants) | 178 merge_lists(dependency_interface.constants, target_interface.constants) |
| 179 merge_lists(dependency_interface.operations, target_interface.operations) | 179 merge_lists(dependency_interface.operations, target_interface.operations) |
| OLD | NEW |