index
:
bazel
master
a fast, scalable, multi-language and extensible build system
about
summary
refs
log
tree
commit
diff
homepage
log msg
author
committer
range
path:
root
/
src
/
tools
/
android
/
java
/
com
/
google
/
devtools
/
build
/
android
/
AndroidDataMerger.java
Commit message (
Expand
)
Author
Age
*
Clean up code that directly imports nested classes like Builder, Entry, etc.
jcater
2018-05-02
*
Create asset merging action
asteinb
2018-04-16
*
Don't check contents of conflicting compiled resources
asteinb
2018-03-07
*
Split the conflict message reporting from the merging.
corysmith
2018-02-13
*
Automatic formatting cleanup of Android *.java files.
jingwen
2017-12-18
*
Create merge action and data deserializer for aapt2 compiled resources.
Googler
2017-11-15
*
Automated rollback of commit 3181c2f1362622985aca24747ed9512573d25dc0.
corysmith
2017-11-06
*
Simplify the merge code, and fix a few incorrectly declared tests.
corysmith
2017-11-06
*
Change the KeyValueConsumer to extend BiConsumer for improved consumer usage.
corysmith
2017-10-20
*
Add flag to turn Android resource merge conflicts from warnings into errors
Googler
2017-07-14
*
Add a new action for generating reconciled R classes for Robolectric.
corysmith
2017-05-23
*
Remove MergingException
corysmith
2017-05-04
*
If resources were prefiltered, ignore unavailable resources from dependencies
Googler
2017-03-22
*
Split AndroidDataDeserializer out of AndroidDataSerializer, as the two classes
Googler
2017-03-14
*
unknown commit of 5: Fixing the merge warning messages in transitive library ...
Googler
2016-12-01
*
Wrap the source Path in a DataSource object.
Googler
2016-10-25
*
Update android_ide_common to 25.0.0 and clean up FolderConfigs
Googler
2016-10-07
*
Add a lightweight resource merge action.
Googler
2016-08-30
*
Flip on @+id parsing by default
Googler
2016-08-22
*
Turn down deprecation warning.
Googler
2016-07-22
*
Parse layout/menu/drawable, etc XML files for R.id
Googler
2016-07-04
*
Fix for combining resources so that the transitive, direct, and primary resou...
Googler
2016-05-17
*
Speed Optimizations:
Googler
2016-05-16
*
Renaming nonOverwriting to combining resources.
Googler
2016-05-10
*
4.95 of 5: Merger changes
Googler
2016-05-05
*
3.75 of 5: Renaming classes and interfaces
Googler
2016-03-31
*
3.73 of 5: Convert xml parsing to use the map based storage
Googler
2016-03-30
*
3.71: Remove ResourceMap, Fix tests
Googler
2016-03-25
*
3.7 of 5: Refactoring ResourceMap generation.
Googler
2016-03-25
*
Part 3.5 of 5: Assets
Googler
2016-03-25
*
Part 3 of 5: Merging semantics.
Googler
2016-03-18