From d61f6e0a07d76d1f159387c51ace5f1cdabb1143 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Tue, 28 Apr 2020 10:20:31 -0700
Subject: Add METADATA to desugar: Apache2=NOTICE

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: Ia0eef7cc030cf125bba81225683f4bb60a90a592
---
 METADATA | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 METADATA

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
-- 
cgit v1.2.3


From 15c557b2d59f2c1600da07ca89a86e4bcfb4e4f3 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 29 Apr 2020 10:21:59 -0700
Subject: Expand desugar METADATA

Test: none
Change-Id: Idc14a4768ea9eccdbfff0aa6602ec60f988689a9
---
 METADATA | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/METADATA b/METADATA
index d97975c..06af0ba 100644
--- a/METADATA
+++ b/METADATA
@@ -1,3 +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
 }
-- 
cgit v1.2.3


From 12b1f91034819c58bd6f96eac01fee2b80d1ebfa Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 19 Jun 2020 13:14:40 -0700
Subject: Use AutoValue from external/auto

Use the AutoValue built from source instead of the prebuilts
from external/dagger2.

Bug: 158870037
Test: m checkbuild
Change-Id: Ibd07aa03e6b3a98a302ea223abf854985b5fec38
---
 Android.bp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index 5db843c..93fd195 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,7 +22,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"],
 }
-- 
cgit v1.2.3


From 1a0fa806ee00dcf790cc214c6317880b7f520e5a Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Fri, 12 Feb 2021 20:49:59 -0800
Subject: [LSC] Add LOCAL_LICENSE_KINDS to external/desugar

Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ic7ebbe147bc93842bca7573b58917cb60dc342fb
---
 Android.bp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Android.bp b/Android.bp
index 93fd195..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"],
-- 
cgit v1.2.3