Snap for 7814173 from e8b353fe03b93e76d48b0745462b7cf9e64bbeba to mainline-ipsec-releaseandroid-mainline-12.0.0_r88android-mainline-12.0.0_r73android-mainline-12.0.0_r61android-mainline-12.0.0_r45android-mainline-12.0.0_r28android-mainline-12.0.0_r118android-mainline-12.0.0_r103android12-mainline-ipsec-release

Change-Id: Ifcfc75d0c51bf5d63ff6641e19e45caf5921bc0a

6 files changed, 70 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 23f5dad..a298f52 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,13 +29,79 @@ license {
     ],
 }
 
-java_import {
+android_library_import {
     name: "glide-prebuilt",
+    aars: [
+        "com/github/bumptech/glide/glide/4.12.0/glide-4.12.0.aar",
+    ],
+    jetifier: true,
+    apex_available: [
+        "com.android.mediaprovider",
+        "//apex_available:platform",
+    ],
+    sdk_version: "current",
+    min_sdk_version: "14",
+    notice: "LICENSE",
+}
+
+android_library_import {
+    name: "glide-disklrucache-prebuilt",
+    aars: [
+        "com/github/bumptech/glide/disklrucache/4.12.0/disklrucache-4.12.0.aar",
+    ],
+    jetifier: true,
+    apex_available: [
+        "com.android.mediaprovider",
+        "//apex_available:platform",
+    ],
+    sdk_version: "current",
+    min_sdk_version: "14",
+    notice: "LICENSE",
+}
+
+android_library_import {
+    name: "glide-gifdecoder-prebuilt",
+    aars: [
+        "com/github/bumptech/glide/gifdecoder/4.12.0/gifdecoder-4.12.0.aar",
+    ],
+    jetifier: true,
+    apex_available: [
+        "com.android.mediaprovider",
+        "//apex_available:platform",
+    ],
+    sdk_version: "current",
+    min_sdk_version: "14",
+    notice: "LICENSE",
+}
+
+java_import {
+    name: "glide-annotation-and-compiler-prebuilt",
     jars: [
-        "com/github/bumptech/glide/glide/4.8.0/glide-4.8.0.jar",
-        "com/github/bumptech/glide/disklrucache/4.8.0/disklrucache-4.8.0.jar",
-        "com/github/bumptech/glide/gifdecoder/4.8.0/gifdecoder-4.8.0.jar",
+        "com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.jar",
+        "com/github/bumptech/glide/annotation/4.12.0/annotations-4.12.0.jar",
     ],
     jetifier: true,
+    apex_available: [
+        "com.android.mediaprovider",
+        "//apex_available:platform",
+    ],
+    sdk_version: "current",
+    min_sdk_version: "14",
     notice: "LICENSE",
 }
+
+java_import_host {
+    name: "glide-annotation-and-compiler-prebuilt-host",
+    jars: [
+        "com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.jar",
+        "com/github/bumptech/glide/annotation/4.12.0/annotations-4.12.0.jar",
+    ],
+    notice: "LICENSE",
+}
+
+java_plugin {
+    name: "glide-annotation-processor",
+    static_libs: ["glide-annotation-and-compiler-prebuilt-host"],
+    processor_class: "com.bumptech.glide.annotation.compiler.GlideAnnotationProcessor",
+    use_tools_jar: true,
+}
diff --git a/com/github/bumptech/glide/annotation/4.12.0/annotations-4.12.0.jar b/com/github/bumptech/glide/annotation/4.12.0/annotations-4.12.0.jar
new file mode 100644
index 0000000..4f82189
--- /dev/null
+++ b/com/github/bumptech/glide/annotation/4.12.0/annotations-4.12.0.jar
diff --git a/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.jar b/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.jar
new file mode 100644
index 0000000..f26f3fd
--- /dev/null
+++ b/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.jar
diff --git a/com/github/bumptech/glide/disklrucache/4.12.0/disklrucache-4.12.0.aar b/com/github/bumptech/glide/disklrucache/4.12.0/disklrucache-4.12.0.aar
new file mode 100644
index 0000000..f26adeb
--- /dev/null
+++ b/com/github/bumptech/glide/disklrucache/4.12.0/disklrucache-4.12.0.aar
diff --git a/com/github/bumptech/glide/gifdecoder/4.12.0/gifdecoder-4.12.0.aar b/com/github/bumptech/glide/gifdecoder/4.12.0/gifdecoder-4.12.0.aar
new file mode 100644
index 0000000..ff4d9b3
--- /dev/null
+++ b/com/github/bumptech/glide/gifdecoder/4.12.0/gifdecoder-4.12.0.aar
diff --git a/com/github/bumptech/glide/glide/4.12.0/glide-4.12.0.aar b/com/github/bumptech/glide/glide/4.12.0/glide-4.12.0.aar
new file mode 100644
index 0000000..00611d6
--- /dev/null
+++ b/com/github/bumptech/glide/glide/4.12.0/glide-4.12.0.aar