Use AutoValue from external/auto
Use the AutoValue built from source instead of the prebuilts
from external/dagger2.
Also replace the annotations that were being picked up from the prebuilts
with local stubs.
Bug: 158870037
Test: m checkbuild
Change-Id: I37eff2258f343a17cb1fa80ca7f36f80aa9536ff
diff --git a/Android.bp b/Android.bp
index 8a1af22..2206d6d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,6 +20,7 @@
srcs: [
"java/**/*.java",
"proto/**/*.proto",
+ "android-annotation-stubs/src/**/*.java",
],
manifest: "manifest.txt",
@@ -28,8 +29,11 @@
"guava",
],
- plugins: ["dagger2-auto-value"],
- libs: ["dagger2-auto-value"],
+ plugins: ["auto_value_plugin"],
+ libs: [
+ "auto_value_annotations",
+ "auto_value_memoized_extension_annotations",
+ ],
proto: {
type: "full",