aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java
Commit message (Collapse)AuthorAge
* Automatic formatting cleanup of Android *.java files.Gravatar jingwen2017-12-18
| | | | | RELNOTES: None. PiperOrigin-RevId: 179425421
* Fix bug where merge conflicts for resources defined in XML with equal values ↵Gravatar Googler2017-07-13
| | | | | | | were being falsely logged during build as warnings RELNOTES: none PiperOrigin-RevId: 161723206
* Improve the error message for simple values by including the value.Gravatar Googler2017-03-31
| | | | | | RELNOTES: None PiperOrigin-RevId: 151630049
* DataSource FixesGravatar Googler2017-03-28
| | | | | | | | | | * Fix the overwrite algorithm to be handled entirely in the accumulators. * Improve the conflict error messages for attributes and simple values. * Refactor the UnwrittenDataSubject to top level for reuse. -- PiperOrigin-RevId: 151439084 MOS_MIGRATED_REVID=151439084
* unknown commit of 5: Fixing the merge warning messages in transitive library ↵Gravatar Googler2016-12-01
| | | | | | | | | overwrites. Record the sources are overwritten during merging. -- MOS_MIGRATED_REVID=140654137
* Fix target info in conflict error message, to avoid toString on objectsGravatar Googler2016-11-04
| | | | | | | that don't implement it. -- MOS_MIGRATED_REVID=138126904
* MergeConflict: fix typo in error message string.Gravatar Googler2016-07-29
| | | | | -- MOS_MIGRATED_REVID=128729088
* Minor backwards compatibility fixes:Gravatar Googler2016-07-21
| | | | | | | | * Account for the dataKey in MergeConflicts (whoops.) * When finding a conflict, always take the last value -- this matches the current merger strategy. -- MOS_MIGRATED_REVID=127980673
* 4.95 of 5: Merger changesGravatar Googler2016-05-05
| | | | | | | | | * Merge conflicts are now bright red warnings, as the previous merger was simultaneously stricter and looser than expected. * Legacy resource rules are now detected and cause bright red warnings. * Merge conflicts will test for equality either of file contents or parsed xml -- MOS_MIGRATED_REVID=121510152
* 3.74 of 5: Remove DataKey from DataValue, FileDataResource and XmlDataResource.Gravatar Googler2016-03-30
| | | | | | | This is mostly mechanical, cleaning up the vestigal marks of combining the value and key. The only mildly odd change is making the OverwritableConsumer and NonOverwritableConsumer package visible, for testing purposes. -- MOS_MIGRATED_REVID=118474980
* 3.73 of 5: Convert xml parsing to use the map based storageGravatar Googler2016-03-30
| | | | | | | | | Introduces two new interfaces: DataValue, which compliments DataKey and allows a cleaner interface MergeConflict AndroidDataSet.KeyValueConsumer, abstraction that allows a common interface for consuming parsed resources, which is a lot cleanr for DataValue as well. -- MOS_MIGRATED_REVID=118466739
* 3.71: Remove ResourceMap, Fix testsGravatar Googler2016-03-25
| | | | | | | | | | 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
* Part 3.5 of 5: AssetsGravatar Googler2016-03-25
| | | | | | | Adds support for parsing and merging assets. This introduces the DataKey and DataAsset interfaces which allow reuse of the FileDataResource for assets, the RelativeAssetPath which acts as a DataKey for assets (the relative asset path is the path that the asset will reside inside the final apk.) It also extends the AndroidDataSetBuilder to handle the creation of assets, and cleans up the interface a little. -- MOS_MIGRATED_REVID=118060379
* Part 3 of 5: Merging semantics.Gravatar Googler2016-03-18
Introduces the AndroidDataMerger, MergeConflict, and UnwrittenMergedAndroidData which is the entry point in the AndroidResourceProcessing *AndroidData lifecycle. Also, refactors the AndroidDataSet parsing of resources, making it functionally immutable. -- MOS_MIGRATED_REVID=117492690