aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java
Commit message (Expand)AuthorAge
* Clean up code that directly imports nested classes like Builder, Entry, etc.Gravatar jcater2018-05-02
* Create asset merging actionGravatar asteinb2018-04-16
* Don't check contents of conflicting compiled resourcesGravatar asteinb2018-03-07
* Split the conflict message reporting from the merging.Gravatar corysmith2018-02-13
* Automatic formatting cleanup of Android *.java files.Gravatar jingwen2017-12-18
* Create merge action and data deserializer for aapt2 compiled resources.Gravatar Googler2017-11-15
* Automated rollback of commit 3181c2f1362622985aca24747ed9512573d25dc0.Gravatar corysmith2017-11-06
* Simplify the merge code, and fix a few incorrectly declared tests.Gravatar corysmith2017-11-06
* Change the KeyValueConsumer to extend BiConsumer for improved consumer usage.Gravatar corysmith2017-10-20
* Add flag to turn Android resource merge conflicts from warnings into errorsGravatar Googler2017-07-14
* Add a new action for generating reconciled R classes for Robolectric.Gravatar corysmith2017-05-23
* Remove MergingExceptionGravatar corysmith2017-05-04
* If resources were prefiltered, ignore unavailable resources from dependenciesGravatar Googler2017-03-22
* Split AndroidDataDeserializer out of AndroidDataSerializer, as the two classesGravatar Googler2017-03-14
* unknown commit of 5: Fixing the merge warning messages in transitive library ...Gravatar Googler2016-12-01
* Wrap the source Path in a DataSource object.Gravatar Googler2016-10-25
* Update android_ide_common to 25.0.0 and clean up FolderConfigsGravatar Googler2016-10-07
* Add a lightweight resource merge action.Gravatar Googler2016-08-30
* Flip on @+id parsing by defaultGravatar Googler2016-08-22
* Turn down deprecation warning.Gravatar Googler2016-07-22
* Parse layout/menu/drawable, etc XML files for R.idGravatar Googler2016-07-04
* Fix for combining resources so that the transitive, direct, and primary resou...Gravatar Googler2016-05-17
* Speed Optimizations:Gravatar Googler2016-05-16
* Renaming nonOverwriting to combining resources.Gravatar Googler2016-05-10
* 4.95 of 5: Merger changesGravatar Googler2016-05-05
* 3.75 of 5: Renaming classes and interfacesGravatar Googler2016-03-31
* 3.73 of 5: Convert xml parsing to use the map based storageGravatar Googler2016-03-30
* 3.71: Remove ResourceMap, Fix testsGravatar Googler2016-03-25
* 3.7 of 5: Refactoring ResourceMap generation.Gravatar Googler2016-03-25
* Part 3.5 of 5: AssetsGravatar Googler2016-03-25
* Part 3 of 5: Merging semantics.Gravatar Googler2016-03-18
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-20 20:00:28 +0000