aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java
Commit message (Expand)AuthorAge
* Normalize parameter name commentsGravatar cushon2018-04-27
* Create asset merging actionGravatar asteinb2018-04-16
* Don't check contents of conflicting compiled resourcesGravatar asteinb2018-03-07
* Implement and delegate ListeningExecutorService api to clean up the try-with-...Gravatar corysmith2018-02-13
* Automatic formatting cleanup of Android *.java files.Gravatar jingwen2017-12-18
* Improve the error messaging by suppressing stack traces for expected errors.Gravatar corysmith2017-11-30
* Create merge action and data deserializer for aapt2 compiled resources.Gravatar Googler2017-11-15
* 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
* Rollback of commit bd40871283a54268945dcb0c47c0326645ffda18.Gravatar Googler2017-03-24
* If resources were prefiltered, ignore unavailable resources from dependenciesGravatar Googler2017-03-22
* Rollback of commit a58f245a4b40c0ef961b1f30d96b16a9349711c3.Gravatar Tobias Werth2017-03-20
* Move library R generation to a separate action, ensuring the merging happensGravatar Googler2017-03-20
* Breaking up is hard to do: AndroidResourceProcessorGravatar Googler2017-03-16