aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2020-06-26 16:54:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-26 16:54:31 +0000
commite9c9ba32c6dca2cef49f61bcba476b8d025d6252 (patch)
tree9be95397550c90cc61806170ab0fafe4c8776cb2
parent678a3d564813c41376a7ed56ac4e63acf4043346 (diff)
parentfd040a46ab4509f79be4b3a6990e12e52aa23607 (diff)
downloadplatform_external_dagger2-e9c9ba32c6dca2cef49f61bcba476b8d025d6252.tar.gz
platform_external_dagger2-e9c9ba32c6dca2cef49f61bcba476b8d025d6252.tar.bz2
platform_external_dagger2-e9c9ba32c6dca2cef49f61bcba476b8d025d6252.zip
Use AutoValue from external/auto am: d33e573c76 am: fd040a46ab
Original change: https://android-review.googlesource.com/c/platform/external/dagger2/+/1351123 Change-Id: Ib45cc2f7fd0052b4fe7cb638c7c5349f5c9a9dbb
-rw-r--r--Android.bp22
1 files changed, 12 insertions, 10 deletions
diff --git a/Android.bp b/Android.bp
index 27a05c5d..2b4a29f7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -169,14 +169,11 @@ java_plugin {
java_resource_dirs: ["resources"],
static_libs: [
+ "auto_common",
"dagger2",
- "dagger2-auto-common",
- "dagger2-auto-factory",
- "dagger2-auto-service",
- "dagger2-auto-value",
- "dagger2-google-java-format",
- "dagger2-inject",
"dagger2-producers",
+ "google_java_format",
+ "dagger2-inject",
"guava",
"javapoet",
],
@@ -185,14 +182,19 @@ java_plugin {
jarjar_rules: "jarjar-rules.txt",
libs: [
+ "auto_factory_annotations",
+ "auto_service_annotations",
+ "auto_value_annotations",
+ "auto_value_memoized_extension_annotations",
"dagger2-android-annotation-stubs",
],
plugins: [
- "dagger2-auto-factory",
- "dagger2-auto-service",
- "dagger2-auto-value",
- "dagger2-auto-annotation",
+ "auto_factory_plugin",
+ "auto_service_plugin",
+ "auto_value_plugin",
+ "auto_value_memoized_extension_plugin",
+ "auto_annotation_plugin",
"dagger2-bootstrap-compiler",
],