diff options
| author |  Googler <noreply@google.com> | 2016-03-25 21:44:29 +0000 |
|---|---|---|
| committer |  Kristina Chodorow <kchodorow@google.com> | 2016-03-25 22:00:58 +0000 |
| commit | 4a317f484b83e2eb265b71b15b4a181a2eba27a9 (patch) | |
| tree | 3fcdbcbac77f04a87c75ea869814709582a66653 /src/main/java/com/google/devtools/build/lib/rules/SkylarkFileType.java | |
| parent | 7b04a1c5cb882bd31dd218fbb434e01ef4f4a922 (diff) | |
3.71: Remove ResourceMap, Fix tests
Removes ResourceMap from AndroidDataSet, now the merge operates directly on the AndroidDataSet instances.
Change tests to use Map<DataKey, Data?> instead of List<Data?>.
Add tests for finding conflicts during AndroidDataSet creation.
Make MergeConflict more test friendly by sorting Paths on creation.
--
MOS_MIGRATED_REVID=118240635
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/SkylarkFileType.java')
0 files changed, 0 insertions, 0 deletions