Snap for 7474514 from 1ea94ff16115ca7886702f3efbb180a892988347 to mainline-media-swcodec-releaseandroid-mainline-12.0.0_r91android-mainline-12.0.0_r75android-mainline-12.0.0_r47android-mainline-12.0.0_r30android-mainline-12.0.0_r13android-mainline-12.0.0_r120android-mainline-12.0.0_r105android12-mainline-media-swcodec-release

Change-Id: I4538d36283548b0753baff7404eb7a7777b0e2ab

2 files changed, 37 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index 5db843c..746e576 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,20 @@
+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"],
@@ -22,7 +39,6 @@ java_library_host {
         "jsr305-3.0.1",
     ],
 
-    // Use Dagger2 annotation processor
-    plugins: ["dagger2-auto-value"],
-    libs: ["dagger2-auto-value"],
+    plugins: ["auto_value_plugin"],
+    libs: ["auto_value_annotations"],
 }
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..06af0ba
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,18 @@
+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
+}