Snap for 8426163 from 5254fa239df6f2dd0771ad4bec180eae4b127324 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I877fd99906f8d7d16384dbb1eeac775d6726383d

2 files changed, 3 insertions, 37 deletions

diff --git a/Android.bp b/Android.bp
index 746e576..5db843c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,20 +1,3 @@
-package {
-    default_applicable_licenses: ["external_desugar_license"],
-}
-
-// Added automatically by a large-scale-change
-// See: http://go/android-license-faq
-license {
-    name: "external_desugar_license",
-    visibility: [":__subpackages__"],
-    license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
-    ],
-    license_text: [
-        "NOTICE",
-    ],
-}
-
 java_library_host {
     name: "desugar",
     srcs: ["java/**/*.java"],
@@ -39,6 +22,7 @@ java_library_host {
         "jsr305-3.0.1",
     ],
 
-    plugins: ["auto_value_plugin"],
-    libs: ["auto_value_annotations"],
+    // Use Dagger2 annotation processor
+    plugins: ["dagger2-auto-value"],
+    libs: ["dagger2-auto-value"],
 }
diff --git a/METADATA b/METADATA
deleted file mode 100644
index 06af0ba..0000000
--- a/METADATA
+++ /dev/null
@@ -1,18 +0,0 @@
-name: "desugar"
-description:
-    "Tool for desugaring Java constructs not supported by Android tools or "
-    "devices."
-
-third_party {
-  url {
-    type: HOMEPAGE
-    value: "https://github.com/bazelbuild/bazel/tree/master/src/tools/android/java/com/google/devtools/build/android/desugar"
-  }
-  url {
-    type: GIT
-    value: "https://github.com/bazelbuild/bazel"
-  }
-  version: "0c12603bedd4a270094137269b910a8587d3f93c"
-  last_upgrade_date { year: 2018 month: 5 day: 3 }
-  license_type: NOTICE
-}