diff options
| author | Colin Cross <ccross@android.com> | 2019-04-11 14:53:12 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-12 22:28:59 -0700 |
| commit | c005ec5aefd8dc1c8adcaf8193ed172abe07fdc9 (patch) | |
| tree | e10a2cf92eabacb9429a77222eafd9f0941fe7c5 /jarjar-rules.txt | |
| parent | 8b7f57bb501fc8c65cd0d3f22092fb36f0174dac (diff) | |
| parent | 10a85ed84b26f48a5d00b65e2cb475a38b6ad4ae (diff) | |
| download | dagger2-c005ec5aefd8dc1c8adcaf8193ed172abe07fdc9.tar.gz | |
Merge tag 'dagger-2.22.1' into master
This resets the state of the source tree to match upstream 2.22.1,
plus Android-specific files.
Bug: 130306229
Test: m checkbuild
Change-Id: I24d365a842a62f7fa70560981ca509e92ec8b7ce
Diffstat (limited to 'jarjar-rules.txt')
| -rw-r--r-- | jarjar-rules.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/jarjar-rules.txt b/jarjar-rules.txt new file mode 100644 index 000000000..57941b373 --- /dev/null +++ b/jarjar-rules.txt @@ -0,0 +1,3 @@ +# shade guava to avoid conflicts with guava embedded in Error Prone. +rule com.google.common.** com.google.dagger.common.@1 +rule com.google.auto.** com.google.dagger.auto.@1 |