From 5f2b51a38753bae6b718a85835f29f3cc43456d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Wed, 26 Jul 2023 13:11:55 +0100
Subject: [PATCH 1/7] Remove unused <uses-sdk android:minSdkVersion="..." />

Issue id: GradleOverrides
This minSdkVersion value (...) is not used; it is always overridden by the value specified in the Gradle build script (...)
Inspection info: The value of (for example) minSdkVersion is only used if it is not specified in the build.gradle build scripts. When specified in the Gradle build scripts, the manifest value is ignored and can be misleading, so should be removed to avoid ambiguity.
---
 integration/compose/src/main/AndroidManifest.xml             | 1 -
 integration/sqljournaldiskcache/src/main/AndroidManifest.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/integration/compose/src/main/AndroidManifest.xml b/integration/compose/src/main/AndroidManifest.xml
index c1d8467ae6..d6dd9b73a5 100644
--- a/integration/compose/src/main/AndroidManifest.xml
+++ b/integration/compose/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bumptech.glide.integration.compose">
-  <uses-sdk android:minSdkVersion="21" />
 </manifest>
\ No newline at end of file
diff --git a/integration/sqljournaldiskcache/src/main/AndroidManifest.xml b/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
index 7c0d043ed1..3407c4b980 100644
--- a/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
+++ b/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bumptech.glide.integration.sqljournaldiskcache">
-  <uses-sdk android:minSdkVersion="14" />
 </manifest>
\ No newline at end of file

From e8b17304a05665a598c3ff88521be8054a828536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Wed, 26 Jul 2023 13:22:15 +0100
Subject: [PATCH 2/7] Remove empty <application /> nodes from manifest.

---
 annotation/compiler/test/src/main/AndroidManifest.xml | 1 -
 benchmark/src/main/AndroidManifest.xml                | 1 -
 integration/concurrent/src/main/AndroidManifest.xml   | 3 ---
 integration/cronet/src/test/AndroidManifest.xml       | 1 -
 integration/gifencoder/src/main/AndroidManifest.xml   | 3 ---
 integration/okhttp/src/main/AndroidManifest.xml       | 2 --
 integration/okhttp4/src/main/AndroidManifest.xml      | 2 --
 integration/recyclerview/src/main/AndroidManifest.xml | 1 -
 library/src/main/AndroidManifest.xml                  | 1 -
 library/test/src/main/AndroidManifest.xml             | 1 -
 mocks/src/main/AndroidManifest.xml                    | 1 -
 testutil/src/main/AndroidManifest.xml                 | 1 -
 third_party/disklrucache/src/main/AndroidManifest.xml | 2 --
 third_party/gif_decoder/src/main/AndroidManifest.xml  | 2 --
 third_party/gif_encoder/src/main/AndroidManifest.xml  | 1 -
 15 files changed, 23 deletions(-)

diff --git a/annotation/compiler/test/src/main/AndroidManifest.xml b/annotation/compiler/test/src/main/AndroidManifest.xml
index a41245187e..8fd022ed82 100644
--- a/annotation/compiler/test/src/main/AndroidManifest.xml
+++ b/annotation/compiler/test/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.bumptech.glide.annotation.compiler.test">
-  <application />
 </manifest>
diff --git a/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml
index ef40b9d17a..8ca989a1b8 100644
--- a/benchmark/src/main/AndroidManifest.xml
+++ b/benchmark/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="com.bumptech.glide.benchmark">
-  <application />
 </manifest>
diff --git a/integration/concurrent/src/main/AndroidManifest.xml b/integration/concurrent/src/main/AndroidManifest.xml
index 92c8e1f5d7..b2592a5606 100644
--- a/integration/concurrent/src/main/AndroidManifest.xml
+++ b/integration/concurrent/src/main/AndroidManifest.xml
@@ -1,6 +1,3 @@
 <manifest
   package="com.bumptech.glide.integration.concurrent">
-
-    <application>
-    </application>
 </manifest>
diff --git a/integration/cronet/src/test/AndroidManifest.xml b/integration/cronet/src/test/AndroidManifest.xml
index 0f9d016ef7..8f379fcd1d 100644
--- a/integration/cronet/src/test/AndroidManifest.xml
+++ b/integration/cronet/src/test/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bumptech.glide.integration.cronet">
-  <application />
   <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 </manifest>
 
diff --git a/integration/gifencoder/src/main/AndroidManifest.xml b/integration/gifencoder/src/main/AndroidManifest.xml
index c2b8a91b37..c300a458ba 100644
--- a/integration/gifencoder/src/main/AndroidManifest.xml
+++ b/integration/gifencoder/src/main/AndroidManifest.xml
@@ -1,6 +1,3 @@
 <manifest
   package="com.bumptech.glide.integration.gifencoder">
-
-    <application>
-    </application>
 </manifest>
diff --git a/integration/okhttp/src/main/AndroidManifest.xml b/integration/okhttp/src/main/AndroidManifest.xml
index 62fac40a32..9d04a77fc6 100644
--- a/integration/okhttp/src/main/AndroidManifest.xml
+++ b/integration/okhttp/src/main/AndroidManifest.xml
@@ -1,5 +1,3 @@
 <manifest
   package="com.bumptech.glide.integration.okhttp">
-
-    <application />
 </manifest>
diff --git a/integration/okhttp4/src/main/AndroidManifest.xml b/integration/okhttp4/src/main/AndroidManifest.xml
index 9ad5e952bf..ff01dd0a5a 100644
--- a/integration/okhttp4/src/main/AndroidManifest.xml
+++ b/integration/okhttp4/src/main/AndroidManifest.xml
@@ -1,5 +1,3 @@
 <manifest
   package="com.bumptech.glide.integration.okhttp">
-
-    <application />
 </manifest>
\ No newline at end of file
diff --git a/integration/recyclerview/src/main/AndroidManifest.xml b/integration/recyclerview/src/main/AndroidManifest.xml
index ec07ec85f9..f75b8b17f1 100644
--- a/integration/recyclerview/src/main/AndroidManifest.xml
+++ b/integration/recyclerview/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
   package="com.bumptech.glide.integration.recyclerview">
-    <application />
 </manifest>
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index d8b515902b..e6b958c93c 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.bumptech.glide">
-  <application/>
 </manifest>
diff --git a/library/test/src/main/AndroidManifest.xml b/library/test/src/main/AndroidManifest.xml
index 600ac91f9c..3ab9ba3da8 100644
--- a/library/test/src/main/AndroidManifest.xml
+++ b/library/test/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="com.bumptech.glide.test">
-    <application/>
 </manifest>
diff --git a/mocks/src/main/AndroidManifest.xml b/mocks/src/main/AndroidManifest.xml
index 35b3d02288..53865be9b0 100644
--- a/mocks/src/main/AndroidManifest.xml
+++ b/mocks/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.bumptech.glide.mocks">
-  <application />
 </manifest>
diff --git a/testutil/src/main/AndroidManifest.xml b/testutil/src/main/AndroidManifest.xml
index 4f9b7f265f..eaebc65841 100644
--- a/testutil/src/main/AndroidManifest.xml
+++ b/testutil/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.bumptech.glide.testutil">
-    <application/>
 </manifest>
diff --git a/third_party/disklrucache/src/main/AndroidManifest.xml b/third_party/disklrucache/src/main/AndroidManifest.xml
index 20eaad4e78..8bcbcb2b3c 100644
--- a/third_party/disklrucache/src/main/AndroidManifest.xml
+++ b/third_party/disklrucache/src/main/AndroidManifest.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.bumptech.glide.disklrucache">
-
-    <application/>
 </manifest>
diff --git a/third_party/gif_decoder/src/main/AndroidManifest.xml b/third_party/gif_decoder/src/main/AndroidManifest.xml
index 9bdfa020a6..78a9ab57cd 100644
--- a/third_party/gif_decoder/src/main/AndroidManifest.xml
+++ b/third_party/gif_decoder/src/main/AndroidManifest.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
   package="com.bumptech.glide.gifdecoder">
-
-    <application/>
 </manifest>
diff --git a/third_party/gif_encoder/src/main/AndroidManifest.xml b/third_party/gif_encoder/src/main/AndroidManifest.xml
index 0b4b09c397..9d5916bf17 100644
--- a/third_party/gif_encoder/src/main/AndroidManifest.xml
+++ b/third_party/gif_encoder/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
   package="com.bumptech.glide.gifencoder">
-  <application />
 </manifest>

From 677321f599d09b99bbd1b83b776dd6b4176c870f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Wed, 26 Jul 2023 13:24:44 +0100
Subject: [PATCH 3/7] Remove unused manifest file.

---
 third_party/gif_encoder/src/main/AndroidManifest.xml | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 third_party/gif_encoder/src/main/AndroidManifest.xml

diff --git a/third_party/gif_encoder/src/main/AndroidManifest.xml b/third_party/gif_encoder/src/main/AndroidManifest.xml
deleted file mode 100644
index 9d5916bf17..0000000000
--- a/third_party/gif_encoder/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-  package="com.bumptech.glide.gifencoder">
-</manifest>

From 3bee8853a9425a27f3cf25fdb5b408b7059936c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Wed, 26 Jul 2023 13:29:00 +0100
Subject: [PATCH 4/7] Add missing `<?xml version="1.0" encoding="utf-8"?>` in
 all AndroidManifest.xml files.

---
 annotation/compiler/test/src/main/AndroidManifest.xml | 1 +
 instrumentation/src/main/AndroidManifest.xml          | 1 +
 integration/avif/src/main/AndroidManifest.xml         | 1 +
 integration/concurrent/src/main/AndroidManifest.xml   | 1 +
 integration/cronet/src/main/AndroidManifest.xml       | 1 +
 integration/gifencoder/src/main/AndroidManifest.xml   | 1 +
 integration/okhttp/src/main/AndroidManifest.xml       | 1 +
 integration/okhttp3/src/main/AndroidManifest.xml      | 1 +
 integration/okhttp4/src/main/AndroidManifest.xml      | 1 +
 mocks/src/main/AndroidManifest.xml                    | 1 +
 10 files changed, 10 insertions(+)

diff --git a/annotation/compiler/test/src/main/AndroidManifest.xml b/annotation/compiler/test/src/main/AndroidManifest.xml
index 8fd022ed82..2aa011166d 100644
--- a/annotation/compiler/test/src/main/AndroidManifest.xml
+++ b/annotation/compiler/test/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.bumptech.glide.annotation.compiler.test">
 </manifest>
diff --git a/instrumentation/src/main/AndroidManifest.xml b/instrumentation/src/main/AndroidManifest.xml
index b1c2f79e71..ebb809527c 100644
--- a/instrumentation/src/main/AndroidManifest.xml
+++ b/instrumentation/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.bumptech.glide.instrumentation">
diff --git a/integration/avif/src/main/AndroidManifest.xml b/integration/avif/src/main/AndroidManifest.xml
index 9819bc0c1c..f9a0793e83 100644
--- a/integration/avif/src/main/AndroidManifest.xml
+++ b/integration/avif/src/main/AndroidManifest.xml
@@ -1,2 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bumptech.glide.integration.avif" />
diff --git a/integration/concurrent/src/main/AndroidManifest.xml b/integration/concurrent/src/main/AndroidManifest.xml
index b2592a5606..eaa43d41bf 100644
--- a/integration/concurrent/src/main/AndroidManifest.xml
+++ b/integration/concurrent/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest
   package="com.bumptech.glide.integration.concurrent">
 </manifest>
diff --git a/integration/cronet/src/main/AndroidManifest.xml b/integration/cronet/src/main/AndroidManifest.xml
index e13bb2f8ae..58ceb6f056 100644
--- a/integration/cronet/src/main/AndroidManifest.xml
+++ b/integration/cronet/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bumptech.glide.integration.cronet">
     <application>
diff --git a/integration/gifencoder/src/main/AndroidManifest.xml b/integration/gifencoder/src/main/AndroidManifest.xml
index c300a458ba..97283b03de 100644
--- a/integration/gifencoder/src/main/AndroidManifest.xml
+++ b/integration/gifencoder/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest
   package="com.bumptech.glide.integration.gifencoder">
 </manifest>
diff --git a/integration/okhttp/src/main/AndroidManifest.xml b/integration/okhttp/src/main/AndroidManifest.xml
index 9d04a77fc6..0093fcb2ce 100644
--- a/integration/okhttp/src/main/AndroidManifest.xml
+++ b/integration/okhttp/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest
   package="com.bumptech.glide.integration.okhttp">
 </manifest>
diff --git a/integration/okhttp3/src/main/AndroidManifest.xml b/integration/okhttp3/src/main/AndroidManifest.xml
index bc8e5a72c3..787fc70b1d 100644
--- a/integration/okhttp3/src/main/AndroidManifest.xml
+++ b/integration/okhttp3/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.bumptech.glide.integration.okhttp">
 
diff --git a/integration/okhttp4/src/main/AndroidManifest.xml b/integration/okhttp4/src/main/AndroidManifest.xml
index ff01dd0a5a..cebf302eef 100644
--- a/integration/okhttp4/src/main/AndroidManifest.xml
+++ b/integration/okhttp4/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest
   package="com.bumptech.glide.integration.okhttp">
 </manifest>
\ No newline at end of file
diff --git a/mocks/src/main/AndroidManifest.xml b/mocks/src/main/AndroidManifest.xml
index 53865be9b0..ccdd43b056 100644
--- a/mocks/src/main/AndroidManifest.xml
+++ b/mocks/src/main/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.bumptech.glide.mocks">
 </manifest>

From 7fe88315c3cc37be9e7711924a81c1fb0916daef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Wed, 26 Jul 2023 13:33:03 +0100
Subject: [PATCH 5/7] Ensure one new line at end of modified files.

---
 annotation/compiler/test/build.gradle                        | 1 -
 annotation/ksp/integrationtest/build.gradle                  | 2 +-
 annotation/ksp/integrationtest/src/main/AndroidManifest.xml  | 2 +-
 annotation/ksp/test/build.gradle                             | 2 +-
 annotation/ksp/test/src/main/AndroidManifest.xml             | 2 +-
 benchmark/build.gradle                                       | 2 +-
 benchmark/src/androidTest/AndroidManifest.xml                | 2 +-
 instrumentation/build.gradle                                 | 1 -
 integration/compose/src/main/AndroidManifest.xml             | 2 +-
 integration/cronet/src/test/AndroidManifest.xml              | 1 -
 integration/ktx/src/main/AndroidManifest.xml                 | 2 +-
 integration/okhttp4/src/main/AndroidManifest.xml             | 2 +-
 integration/sqljournaldiskcache/src/main/AndroidManifest.xml | 2 +-
 samples/imgur/build.gradle                                   | 1 -
 samples/imgur/src/main/AndroidManifest.xml                   | 2 +-
 15 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/annotation/compiler/test/build.gradle b/annotation/compiler/test/build.gradle
index 925402b22c..ec8529e83c 100644
--- a/annotation/compiler/test/build.gradle
+++ b/annotation/compiler/test/build.gradle
@@ -94,4 +94,3 @@ task regenerateTestResources {
 afterEvaluate {
     regenerateTestResources.finalizedBy(testReleaseUnitTest)
 }
-
diff --git a/annotation/ksp/integrationtest/build.gradle b/annotation/ksp/integrationtest/build.gradle
index 16ee4b0d07..6b379e0a51 100644
--- a/annotation/ksp/integrationtest/build.gradle
+++ b/annotation/ksp/integrationtest/build.gradle
@@ -35,4 +35,4 @@ dependencies {
     testImplementation libs.truth
     testImplementation libs.kotlin.test
     testImplementation project(path: ':annotation:ksp:test')
-}
\ No newline at end of file
+}
diff --git a/annotation/ksp/integrationtest/src/main/AndroidManifest.xml b/annotation/ksp/integrationtest/src/main/AndroidManifest.xml
index 0ffb83e81e..edf12fb1a5 100644
--- a/annotation/ksp/integrationtest/src/main/AndroidManifest.xml
+++ b/annotation/ksp/integrationtest/src/main/AndroidManifest.xml
@@ -2,4 +2,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.bumptech.glide.annotation.ksp.integrationtest">
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/annotation/ksp/test/build.gradle b/annotation/ksp/test/build.gradle
index 8de75bffa7..292dcd5b92 100644
--- a/annotation/ksp/test/build.gradle
+++ b/annotation/ksp/test/build.gradle
@@ -22,4 +22,4 @@ dependencies {
     testImplementation project(":annotation")
     testImplementation project(":glide")
     testImplementation libs.kotlin.test
-}
\ No newline at end of file
+}
diff --git a/annotation/ksp/test/src/main/AndroidManifest.xml b/annotation/ksp/test/src/main/AndroidManifest.xml
index 24d1ba23d8..91d7cf5740 100644
--- a/annotation/ksp/test/src/main/AndroidManifest.xml
+++ b/annotation/ksp/test/src/main/AndroidManifest.xml
@@ -2,4 +2,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.bumptech.glide.annotation.ksp.test">
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index e5022d06ee..fb9768b80f 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -41,4 +41,4 @@ dependencies {
     androidTestImplementation project(':testutil')
     androidTestImplementation libs.androidx.benchmark.junit
     androidTestImplementation libs.guava
-}
\ No newline at end of file
+}
diff --git a/benchmark/src/androidTest/AndroidManifest.xml b/benchmark/src/androidTest/AndroidManifest.xml
index a0c5e81e03..6c0e836668 100644
--- a/benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
     tools:ignore="HardcodedDebugMode"
     tools:replace="android:debuggable" >
   </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
index f884cd9c8c..5f7d0026d8 100644
--- a/instrumentation/build.gradle
+++ b/instrumentation/build.gradle
@@ -53,4 +53,3 @@ android {
         }
     }
 }
-
diff --git a/integration/compose/src/main/AndroidManifest.xml b/integration/compose/src/main/AndroidManifest.xml
index d6dd9b73a5..c4c4da7490 100644
--- a/integration/compose/src/main/AndroidManifest.xml
+++ b/integration/compose/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bumptech.glide.integration.compose">
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/integration/cronet/src/test/AndroidManifest.xml b/integration/cronet/src/test/AndroidManifest.xml
index 8f379fcd1d..1cb457d16b 100644
--- a/integration/cronet/src/test/AndroidManifest.xml
+++ b/integration/cronet/src/test/AndroidManifest.xml
@@ -3,4 +3,3 @@
     package="com.bumptech.glide.integration.cronet">
   <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 </manifest>
-
diff --git a/integration/ktx/src/main/AndroidManifest.xml b/integration/ktx/src/main/AndroidManifest.xml
index 1a4808764d..97fbcf926f 100644
--- a/integration/ktx/src/main/AndroidManifest.xml
+++ b/integration/ktx/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumptech.glide.integration.ktx" />
\ No newline at end of file
+<manifest package="com.bumptech.glide.integration.ktx" />
diff --git a/integration/okhttp4/src/main/AndroidManifest.xml b/integration/okhttp4/src/main/AndroidManifest.xml
index cebf302eef..0093fcb2ce 100644
--- a/integration/okhttp4/src/main/AndroidManifest.xml
+++ b/integration/okhttp4/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
   package="com.bumptech.glide.integration.okhttp">
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/integration/sqljournaldiskcache/src/main/AndroidManifest.xml b/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
index 3407c4b980..84c979f69e 100644
--- a/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
+++ b/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.bumptech.glide.integration.sqljournaldiskcache">
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/samples/imgur/build.gradle b/samples/imgur/build.gradle
index 34a7056bd9..c8d165a80b 100644
--- a/samples/imgur/build.gradle
+++ b/samples/imgur/build.gradle
@@ -53,4 +53,3 @@ task run(type: Exec, dependsOn: 'installDebug') {
     description 'Installs the APK and runs the main activity: "gradlew :samples:???:run"'
     commandLine "${android.sdkDirectory}/platform-tools/adb", 'shell', 'am', 'start', '-n', 'com.bumptech.glide.samples.card/.MainActivity'
 }
-
diff --git a/samples/imgur/src/main/AndroidManifest.xml b/samples/imgur/src/main/AndroidManifest.xml
index 3e3fa4c1fe..7487a65345 100644
--- a/samples/imgur/src/main/AndroidManifest.xml
+++ b/samples/imgur/src/main/AndroidManifest.xml
@@ -28,4 +28,4 @@
     </activity>
   </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

From 87b7c403d96e457494f1662c2ecd9194c712d58a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Wed, 26 Jul 2023 13:42:24 +0100
Subject: [PATCH 6/7] Migrate <manifest package="..." in AndroidManifest.xml to
 namespace '...' in build.gradle.

---
 annotation/compiler/test/build.gradle                        | 1 +
 annotation/compiler/test/src/main/AndroidManifest.xml        | 4 +---
 annotation/ksp/integrationtest/build.gradle                  | 1 +
 annotation/ksp/integrationtest/src/main/AndroidManifest.xml  | 5 +----
 annotation/ksp/test/build.gradle                             | 1 +
 annotation/ksp/test/src/main/AndroidManifest.xml             | 5 +----
 benchmark/build.gradle                                       | 1 +
 benchmark/src/androidTest/AndroidManifest.xml                | 3 +--
 benchmark/src/main/AndroidManifest.xml                       | 3 +--
 instrumentation/build.gradle                                 | 2 +-
 instrumentation/src/main/AndroidManifest.xml                 | 4 ++--
 integration/avif/build.gradle                                | 1 +
 integration/avif/src/main/AndroidManifest.xml                | 3 +--
 integration/compose/build.gradle                             | 1 +
 integration/compose/src/main/AndroidManifest.xml             | 4 +---
 integration/concurrent/build.gradle                          | 1 +
 integration/concurrent/src/main/AndroidManifest.xml          | 4 +---
 integration/cronet/build.gradle                              | 1 +
 integration/cronet/src/main/AndroidManifest.xml              | 4 ++--
 integration/cronet/src/test/AndroidManifest.xml              | 3 +--
 integration/gifencoder/build.gradle                          | 1 +
 integration/gifencoder/src/main/AndroidManifest.xml          | 4 +---
 integration/ktx/build.gradle                                 | 1 +
 integration/ktx/src/main/AndroidManifest.xml                 | 2 +-
 integration/okhttp/build.gradle                              | 1 +
 integration/okhttp/src/main/AndroidManifest.xml              | 4 +---
 integration/okhttp3/build.gradle                             | 1 +
 integration/okhttp3/src/main/AndroidManifest.xml             | 3 +--
 integration/okhttp4/build.gradle                             | 1 +
 integration/okhttp4/src/main/AndroidManifest.xml             | 4 +---
 integration/recyclerview/build.gradle                        | 1 +
 integration/recyclerview/src/main/AndroidManifest.xml        | 4 +---
 integration/sqljournaldiskcache/build.gradle                 | 1 +
 integration/sqljournaldiskcache/src/main/AndroidManifest.xml | 4 +---
 integration/volley/build.gradle                              | 1 +
 integration/volley/src/main/AndroidManifest.xml              | 3 +--
 library/build.gradle                                         | 1 +
 library/src/main/AndroidManifest.xml                         | 4 +---
 library/test/build.gradle                                    | 1 +
 library/test/src/main/AndroidManifest.xml                    | 3 +--
 mocks/build.gradle                                           | 1 +
 mocks/src/main/AndroidManifest.xml                           | 4 +---
 samples/contacturi/build.gradle                              | 2 +-
 samples/contacturi/src/main/AndroidManifest.xml              | 3 +--
 samples/flickr/build.gradle                                  | 2 +-
 samples/flickr/src/main/AndroidManifest.xml                  | 3 +--
 samples/gallery/build.gradle                                 | 2 +-
 samples/gallery/src/main/AndroidManifest.xml                 | 3 +--
 samples/giphy/build.gradle                                   | 2 +-
 samples/giphy/src/main/AndroidManifest.xml                   | 3 +--
 samples/imgur/build.gradle                                   | 2 +-
 samples/imgur/src/main/AndroidManifest.xml                   | 3 +--
 samples/svg/build.gradle                                     | 2 +-
 samples/svg/src/main/AndroidManifest.xml                     | 3 +--
 testutil/build.gradle                                        | 1 +
 testutil/src/main/AndroidManifest.xml                        | 4 +---
 third_party/disklrucache/build.gradle                        | 1 +
 third_party/disklrucache/src/main/AndroidManifest.xml        | 4 +---
 third_party/gif_decoder/build.gradle                         | 1 +
 third_party/gif_decoder/src/main/AndroidManifest.xml         | 4 +---
 60 files changed, 62 insertions(+), 85 deletions(-)

diff --git a/annotation/compiler/test/build.gradle b/annotation/compiler/test/build.gradle
index ec8529e83c..d862ce572f 100644
--- a/annotation/compiler/test/build.gradle
+++ b/annotation/compiler/test/build.gradle
@@ -27,6 +27,7 @@ afterEvaluate {
 }
 
 android {
+    namespace 'com.bumptech.glide.annotation.compiler.test'
     compileSdk libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/annotation/compiler/test/src/main/AndroidManifest.xml b/annotation/compiler/test/src/main/AndroidManifest.xml
index 2aa011166d..8072ee00db 100644
--- a/annotation/compiler/test/src/main/AndroidManifest.xml
+++ b/annotation/compiler/test/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.bumptech.glide.annotation.compiler.test">
-</manifest>
+<manifest />
diff --git a/annotation/ksp/integrationtest/build.gradle b/annotation/ksp/integrationtest/build.gradle
index 6b379e0a51..2454135cde 100644
--- a/annotation/ksp/integrationtest/build.gradle
+++ b/annotation/ksp/integrationtest/build.gradle
@@ -15,6 +15,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.annotation.ksp.integrationtest'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/annotation/ksp/integrationtest/src/main/AndroidManifest.xml b/annotation/ksp/integrationtest/src/main/AndroidManifest.xml
index edf12fb1a5..8072ee00db 100644
--- a/annotation/ksp/integrationtest/src/main/AndroidManifest.xml
+++ b/annotation/ksp/integrationtest/src/main/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.bumptech.glide.annotation.ksp.integrationtest">
-
-</manifest>
+<manifest />
diff --git a/annotation/ksp/test/build.gradle b/annotation/ksp/test/build.gradle
index 292dcd5b92..c305c65a60 100644
--- a/annotation/ksp/test/build.gradle
+++ b/annotation/ksp/test/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.annotation.ksp.test'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/annotation/ksp/test/src/main/AndroidManifest.xml b/annotation/ksp/test/src/main/AndroidManifest.xml
index 91d7cf5740..8072ee00db 100644
--- a/annotation/ksp/test/src/main/AndroidManifest.xml
+++ b/annotation/ksp/test/src/main/AndroidManifest.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.bumptech.glide.annotation.ksp.test">
-</manifest>
+<manifest />
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index fb9768b80f..65a8fb817f 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.benchmark'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     buildToolsVersion "30.0.3"
diff --git a/benchmark/src/androidTest/AndroidManifest.xml b/benchmark/src/androidTest/AndroidManifest.xml
index 6c0e836668..7795cfbe2e 100644
--- a/benchmark/src/androidTest/AndroidManifest.xml
+++ b/benchmark/src/androidTest/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="com.bumptech.glide.benchmark">
+  xmlns:tools="http://schemas.android.com/tools">
 
   <!--
       Important: disable debugging for accurate performance results
diff --git a/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml
index 8ca989a1b8..8072ee00db 100644
--- a/benchmark/src/main/AndroidManifest.xml
+++ b/benchmark/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumptech.glide.benchmark">
-</manifest>
+<manifest />
diff --git a/instrumentation/build.gradle b/instrumentation/build.gradle
index 5f7d0026d8..b1c8699a1c 100644
--- a/instrumentation/build.gradle
+++ b/instrumentation/build.gradle
@@ -30,10 +30,10 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.instrumentation'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.instrumentation'
         minSdk libs.versions.min.sdk.version.get() as int
         targetSdk libs.versions.target.sdk.version.get() as int
         versionCode 1
diff --git a/instrumentation/src/main/AndroidManifest.xml b/instrumentation/src/main/AndroidManifest.xml
index ebb809527c..8865c5eff0 100644
--- a/instrumentation/src/main/AndroidManifest.xml
+++ b/instrumentation/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.bumptech.glide.instrumentation">
+    xmlns:tools="http://schemas.android.com/tools">
+
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
   <application
diff --git a/integration/avif/build.gradle b/integration/avif/build.gradle
index ff5209519b..807869f3af 100644
--- a/integration/avif/build.gradle
+++ b/integration/avif/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.avif'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/avif/src/main/AndroidManifest.xml b/integration/avif/src/main/AndroidManifest.xml
index f9a0793e83..8072ee00db 100644
--- a/integration/avif/src/main/AndroidManifest.xml
+++ b/integration/avif/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide.integration.avif" />
+<manifest />
diff --git a/integration/compose/build.gradle b/integration/compose/build.gradle
index 6569fe7ed9..9c6b6ebaff 100644
--- a/integration/compose/build.gradle
+++ b/integration/compose/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.compose'
     compileSdk 33
 
     defaultConfig {
diff --git a/integration/compose/src/main/AndroidManifest.xml b/integration/compose/src/main/AndroidManifest.xml
index c4c4da7490..8072ee00db 100644
--- a/integration/compose/src/main/AndroidManifest.xml
+++ b/integration/compose/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide.integration.compose">
-</manifest>
+<manifest />
diff --git a/integration/concurrent/build.gradle b/integration/concurrent/build.gradle
index 4b165aeab8..280ddacb5b 100644
--- a/integration/concurrent/build.gradle
+++ b/integration/concurrent/build.gradle
@@ -14,6 +14,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.concurrent'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/concurrent/src/main/AndroidManifest.xml b/integration/concurrent/src/main/AndroidManifest.xml
index eaa43d41bf..8072ee00db 100644
--- a/integration/concurrent/src/main/AndroidManifest.xml
+++ b/integration/concurrent/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  package="com.bumptech.glide.integration.concurrent">
-</manifest>
+<manifest />
diff --git a/integration/cronet/build.gradle b/integration/cronet/build.gradle
index 2cf3ac755b..a33c65df5c 100644
--- a/integration/cronet/build.gradle
+++ b/integration/cronet/build.gradle
@@ -16,6 +16,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.cronet'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/cronet/src/main/AndroidManifest.xml b/integration/cronet/src/main/AndroidManifest.xml
index 58ceb6f056..9695d0b6ba 100644
--- a/integration/cronet/src/main/AndroidManifest.xml
+++ b/integration/cronet/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide.integration.cronet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
     <application>
         <meta-data
             android:name="com.bumptech.glide.integration.cronet.CronetGlideModule"
diff --git a/integration/cronet/src/test/AndroidManifest.xml b/integration/cronet/src/test/AndroidManifest.xml
index 1cb457d16b..7643fa4da8 100644
--- a/integration/cronet/src/test/AndroidManifest.xml
+++ b/integration/cronet/src/test/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide.integration.cronet">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 </manifest>
diff --git a/integration/gifencoder/build.gradle b/integration/gifencoder/build.gradle
index ece4e4a913..b31d416d99 100644
--- a/integration/gifencoder/build.gradle
+++ b/integration/gifencoder/build.gradle
@@ -14,6 +14,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.gifencoder'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     sourceSets {
diff --git a/integration/gifencoder/src/main/AndroidManifest.xml b/integration/gifencoder/src/main/AndroidManifest.xml
index 97283b03de..8072ee00db 100644
--- a/integration/gifencoder/src/main/AndroidManifest.xml
+++ b/integration/gifencoder/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  package="com.bumptech.glide.integration.gifencoder">
-</manifest>
+<manifest />
diff --git a/integration/ktx/build.gradle b/integration/ktx/build.gradle
index b45e28d72e..1356408b24 100644
--- a/integration/ktx/build.gradle
+++ b/integration/ktx/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.ktx'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/ktx/src/main/AndroidManifest.xml b/integration/ktx/src/main/AndroidManifest.xml
index 97fbcf926f..8072ee00db 100644
--- a/integration/ktx/src/main/AndroidManifest.xml
+++ b/integration/ktx/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumptech.glide.integration.ktx" />
+<manifest />
diff --git a/integration/okhttp/build.gradle b/integration/okhttp/build.gradle
index b3f71f8c19..15b1fa91d3 100644
--- a/integration/okhttp/build.gradle
+++ b/integration/okhttp/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.okhttp'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/okhttp/src/main/AndroidManifest.xml b/integration/okhttp/src/main/AndroidManifest.xml
index 0093fcb2ce..8072ee00db 100644
--- a/integration/okhttp/src/main/AndroidManifest.xml
+++ b/integration/okhttp/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  package="com.bumptech.glide.integration.okhttp">
-</manifest>
+<manifest />
diff --git a/integration/okhttp3/build.gradle b/integration/okhttp3/build.gradle
index c6e1e02721..2c80d7a020 100644
--- a/integration/okhttp3/build.gradle
+++ b/integration/okhttp3/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.okhttp'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/okhttp3/src/main/AndroidManifest.xml b/integration/okhttp3/src/main/AndroidManifest.xml
index 787fc70b1d..9bd246d78e 100644
--- a/integration/okhttp3/src/main/AndroidManifest.xml
+++ b/integration/okhttp3/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bumptech.glide.integration.okhttp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data
diff --git a/integration/okhttp4/build.gradle b/integration/okhttp4/build.gradle
index a9da17bb93..0abae0ce26 100644
--- a/integration/okhttp4/build.gradle
+++ b/integration/okhttp4/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.okhttp'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/okhttp4/src/main/AndroidManifest.xml b/integration/okhttp4/src/main/AndroidManifest.xml
index 0093fcb2ce..8072ee00db 100644
--- a/integration/okhttp4/src/main/AndroidManifest.xml
+++ b/integration/okhttp4/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  package="com.bumptech.glide.integration.okhttp">
-</manifest>
+<manifest />
diff --git a/integration/recyclerview/build.gradle b/integration/recyclerview/build.gradle
index e3d078a198..f5a2d4939f 100644
--- a/integration/recyclerview/build.gradle
+++ b/integration/recyclerview/build.gradle
@@ -7,6 +7,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.recyclerview'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/recyclerview/src/main/AndroidManifest.xml b/integration/recyclerview/src/main/AndroidManifest.xml
index f75b8b17f1..8072ee00db 100644
--- a/integration/recyclerview/src/main/AndroidManifest.xml
+++ b/integration/recyclerview/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  package="com.bumptech.glide.integration.recyclerview">
-</manifest>
+<manifest />
diff --git a/integration/sqljournaldiskcache/build.gradle b/integration/sqljournaldiskcache/build.gradle
index af44543f1e..add9589fb5 100644
--- a/integration/sqljournaldiskcache/build.gradle
+++ b/integration/sqljournaldiskcache/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.sqljournaldiskcache'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/sqljournaldiskcache/src/main/AndroidManifest.xml b/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
index 84c979f69e..8072ee00db 100644
--- a/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
+++ b/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide.integration.sqljournaldiskcache">
-</manifest>
+<manifest />
diff --git a/integration/volley/build.gradle b/integration/volley/build.gradle
index 8120eca2df..06bd1b7466 100644
--- a/integration/volley/build.gradle
+++ b/integration/volley/build.gradle
@@ -18,6 +18,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.integration.volley'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/integration/volley/src/main/AndroidManifest.xml b/integration/volley/src/main/AndroidManifest.xml
index af744318ae..11efaf5799 100644
--- a/integration/volley/src/main/AndroidManifest.xml
+++ b/integration/volley/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bumptech.glide.integration.volley">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data
diff --git a/library/build.gradle b/library/build.gradle
index 9c8bd6eabf..d3c3df12e5 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -59,6 +59,7 @@ if (project.plugins.hasPlugin('net.ltgt.errorprone')) {
 }
 
 android {
+    namespace 'com.bumptech.glide'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index e6b958c93c..8072ee00db 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.bumptech.glide">
-</manifest>
+<manifest />
diff --git a/library/test/build.gradle b/library/test/build.gradle
index 9a8b568c1d..baa1f700f5 100644
--- a/library/test/build.gradle
+++ b/library/test/build.gradle
@@ -40,6 +40,7 @@ android.testOptions.unitTests.all { Test testTask ->
 }
 
 android {
+    namespace 'com.bumptech.glide.test'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/library/test/src/main/AndroidManifest.xml b/library/test/src/main/AndroidManifest.xml
index 3ab9ba3da8..8072ee00db 100644
--- a/library/test/src/main/AndroidManifest.xml
+++ b/library/test/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.bumptech.glide.test">
-</manifest>
+<manifest />
diff --git a/mocks/build.gradle b/mocks/build.gradle
index 19d6e462a7..92be3ffd96 100644
--- a/mocks/build.gradle
+++ b/mocks/build.gradle
@@ -8,6 +8,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.mocks'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/mocks/src/main/AndroidManifest.xml b/mocks/src/main/AndroidManifest.xml
index ccdd43b056..8072ee00db 100644
--- a/mocks/src/main/AndroidManifest.xml
+++ b/mocks/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.bumptech.glide.mocks">
-</manifest>
+<manifest />
diff --git a/samples/contacturi/build.gradle b/samples/contacturi/build.gradle
index 54c14954e5..88574ad4d5 100644
--- a/samples/contacturi/build.gradle
+++ b/samples/contacturi/build.gradle
@@ -7,10 +7,10 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.samples.contacturi'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.samples.contacturi'
         minSdk libs.versions.min.sdk.version.get() as int
         targetSdk libs.versions.target.sdk.version.get() as int
 
diff --git a/samples/contacturi/src/main/AndroidManifest.xml b/samples/contacturi/src/main/AndroidManifest.xml
index e4914780b5..474f8658ad 100644
--- a/samples/contacturi/src/main/AndroidManifest.xml
+++ b/samples/contacturi/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide.samples.contacturi" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 
diff --git a/samples/flickr/build.gradle b/samples/flickr/build.gradle
index d78280f865..5ae6ab1cd6 100644
--- a/samples/flickr/build.gradle
+++ b/samples/flickr/build.gradle
@@ -13,10 +13,10 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.samples.flickr'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.samples.flickr'
         minSdk libs.versions.min.sdk.version.get() as int
         targetSdk libs.versions.target.sdk.version.get() as int
 
diff --git a/samples/flickr/src/main/AndroidManifest.xml b/samples/flickr/src/main/AndroidManifest.xml
index 9b0acf8d64..6a063a919b 100644
--- a/samples/flickr/src/main/AndroidManifest.xml
+++ b/samples/flickr/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="com.bumptech.glide.samples.flickr">
+  xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <!--
diff --git a/samples/gallery/build.gradle b/samples/gallery/build.gradle
index 20fadbedda..51a1609db9 100644
--- a/samples/gallery/build.gradle
+++ b/samples/gallery/build.gradle
@@ -29,10 +29,10 @@ kotlin {
 }
 
 android {
+    namespace 'com.bumptech.glide.samples.gallery'
     compileSdk 34
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.samples.gallery'
         minSdk 29
         targetSdk 34
         versionCode 1
diff --git a/samples/gallery/src/main/AndroidManifest.xml b/samples/gallery/src/main/AndroidManifest.xml
index 6ab0378306..d27d91c50f 100644
--- a/samples/gallery/src/main/AndroidManifest.xml
+++ b/samples/gallery/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bumptech.glide.samples.gallery">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-sdk
     android:minSdkVersion="29"
diff --git a/samples/giphy/build.gradle b/samples/giphy/build.gradle
index d58829317b..1bd128298c 100644
--- a/samples/giphy/build.gradle
+++ b/samples/giphy/build.gradle
@@ -12,10 +12,10 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.samples.giphy'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.samples.giphy'
         minSdk libs.versions.min.sdk.version.get() as int
         targetSdk libs.versions.target.sdk.version.get() as int
         versionCode 1
diff --git a/samples/giphy/src/main/AndroidManifest.xml b/samples/giphy/src/main/AndroidManifest.xml
index 9e6e770df0..755a034a3c 100644
--- a/samples/giphy/src/main/AndroidManifest.xml
+++ b/samples/giphy/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bumptech.glide.samples.giphy">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <!--
diff --git a/samples/imgur/build.gradle b/samples/imgur/build.gradle
index c8d165a80b..2ae096994b 100644
--- a/samples/imgur/build.gradle
+++ b/samples/imgur/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace 'com.bumptech.glide.samples.imgur'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
-        applicationId "com.bumptech.glide.samples.imgur"
         minSdk libs.versions.min.sdk.version.get() as int
         targetSdk libs.versions.target.sdk.version.get() as int
         versionCode 1
diff --git a/samples/imgur/src/main/AndroidManifest.xml b/samples/imgur/src/main/AndroidManifest.xml
index 7487a65345..f3dd05437b 100644
--- a/samples/imgur/src/main/AndroidManifest.xml
+++ b/samples/imgur/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  package="com.bumptech.glide.samples.imgur">
+  xmlns:tools="http://schemas.android.com/tools">
   <uses-permission android:name="android.permission.INTERNET" />
   <!--
   Allows Glide to monitor connectivity status and restart failed requests if users go from a
diff --git a/samples/svg/build.gradle b/samples/svg/build.gradle
index 41a9d5738e..2b59bb4e98 100644
--- a/samples/svg/build.gradle
+++ b/samples/svg/build.gradle
@@ -8,10 +8,10 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.samples.svg'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
-        applicationId 'com.bumptech.glide.samples.svg'
         minSdk libs.versions.min.sdk.version.get() as int
         targetSdk libs.versions.target.sdk.version.get() as int
 
diff --git a/samples/svg/src/main/AndroidManifest.xml b/samples/svg/src/main/AndroidManifest.xml
index 24cee5a197..b32cd30e50 100644
--- a/samples/svg/src/main/AndroidManifest.xml
+++ b/samples/svg/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.bumptech.glide.samples.svg" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
diff --git a/testutil/build.gradle b/testutil/build.gradle
index 8cb2dcebb9..79b07fd673 100644
--- a/testutil/build.gradle
+++ b/testutil/build.gradle
@@ -9,6 +9,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.testutil'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/testutil/src/main/AndroidManifest.xml b/testutil/src/main/AndroidManifest.xml
index eaebc65841..8072ee00db 100644
--- a/testutil/src/main/AndroidManifest.xml
+++ b/testutil/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bumptech.glide.testutil">
-</manifest>
+<manifest />
diff --git a/third_party/disklrucache/build.gradle b/third_party/disklrucache/build.gradle
index baeeb3066d..1fef6b67b0 100644
--- a/third_party/disklrucache/build.gradle
+++ b/third_party/disklrucache/build.gradle
@@ -11,6 +11,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.disklrucache'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/third_party/disklrucache/src/main/AndroidManifest.xml b/third_party/disklrucache/src/main/AndroidManifest.xml
index 8bcbcb2b3c..8072ee00db 100644
--- a/third_party/disklrucache/src/main/AndroidManifest.xml
+++ b/third_party/disklrucache/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.bumptech.glide.disklrucache">
-</manifest>
+<manifest />
diff --git a/third_party/gif_decoder/build.gradle b/third_party/gif_decoder/build.gradle
index c3a4c55e90..1cc6bcba9a 100644
--- a/third_party/gif_decoder/build.gradle
+++ b/third_party/gif_decoder/build.gradle
@@ -12,6 +12,7 @@ dependencies {
 }
 
 android {
+    namespace 'com.bumptech.glide.gifdecoder'
     compileSdkVersion libs.versions.compile.sdk.version.get()
 
     defaultConfig {
diff --git a/third_party/gif_decoder/src/main/AndroidManifest.xml b/third_party/gif_decoder/src/main/AndroidManifest.xml
index 78a9ab57cd..8072ee00db 100644
--- a/third_party/gif_decoder/src/main/AndroidManifest.xml
+++ b/third_party/gif_decoder/src/main/AndroidManifest.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-  package="com.bumptech.glide.gifdecoder">
-</manifest>
+<manifest />

From c8ef39ca25bb6296dbc7b0bd12eecc5e8fc64dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=B3bert=20Papp=20=28TWiStErRob=29?=
 <papp.robert.s@gmail.com>
Date: Wed, 26 Jul 2023 16:39:58 +0100
Subject: [PATCH 7/7] Remove empty AndroidManifest.xml files.

---
 annotation/compiler/test/src/main/AndroidManifest.xml        | 2 --
 annotation/ksp/integrationtest/src/main/AndroidManifest.xml  | 2 --
 annotation/ksp/test/src/main/AndroidManifest.xml             | 2 --
 benchmark/src/main/AndroidManifest.xml                       | 2 --
 integration/avif/src/main/AndroidManifest.xml                | 2 --
 integration/compose/src/main/AndroidManifest.xml             | 2 --
 integration/concurrent/src/main/AndroidManifest.xml          | 2 --
 integration/gifencoder/src/main/AndroidManifest.xml          | 2 --
 integration/ktx/src/main/AndroidManifest.xml                 | 2 --
 integration/okhttp/src/main/AndroidManifest.xml              | 2 --
 integration/okhttp4/src/main/AndroidManifest.xml             | 2 --
 integration/recyclerview/src/main/AndroidManifest.xml        | 2 --
 integration/sqljournaldiskcache/src/main/AndroidManifest.xml | 2 --
 library/src/main/AndroidManifest.xml                         | 2 --
 library/test/src/main/AndroidManifest.xml                    | 2 --
 mocks/src/main/AndroidManifest.xml                           | 2 --
 testutil/src/main/AndroidManifest.xml                        | 2 --
 third_party/disklrucache/src/main/AndroidManifest.xml        | 2 --
 third_party/gif_decoder/src/main/AndroidManifest.xml         | 2 --
 19 files changed, 38 deletions(-)
 delete mode 100644 annotation/compiler/test/src/main/AndroidManifest.xml
 delete mode 100644 annotation/ksp/integrationtest/src/main/AndroidManifest.xml
 delete mode 100644 annotation/ksp/test/src/main/AndroidManifest.xml
 delete mode 100644 benchmark/src/main/AndroidManifest.xml
 delete mode 100644 integration/avif/src/main/AndroidManifest.xml
 delete mode 100644 integration/compose/src/main/AndroidManifest.xml
 delete mode 100644 integration/concurrent/src/main/AndroidManifest.xml
 delete mode 100644 integration/gifencoder/src/main/AndroidManifest.xml
 delete mode 100644 integration/ktx/src/main/AndroidManifest.xml
 delete mode 100644 integration/okhttp/src/main/AndroidManifest.xml
 delete mode 100644 integration/okhttp4/src/main/AndroidManifest.xml
 delete mode 100644 integration/recyclerview/src/main/AndroidManifest.xml
 delete mode 100644 integration/sqljournaldiskcache/src/main/AndroidManifest.xml
 delete mode 100644 library/src/main/AndroidManifest.xml
 delete mode 100644 library/test/src/main/AndroidManifest.xml
 delete mode 100644 mocks/src/main/AndroidManifest.xml
 delete mode 100644 testutil/src/main/AndroidManifest.xml
 delete mode 100644 third_party/disklrucache/src/main/AndroidManifest.xml
 delete mode 100644 third_party/gif_decoder/src/main/AndroidManifest.xml

diff --git a/annotation/compiler/test/src/main/AndroidManifest.xml b/annotation/compiler/test/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/annotation/compiler/test/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/annotation/ksp/integrationtest/src/main/AndroidManifest.xml b/annotation/ksp/integrationtest/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/annotation/ksp/integrationtest/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/annotation/ksp/test/src/main/AndroidManifest.xml b/annotation/ksp/test/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/annotation/ksp/test/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/benchmark/src/main/AndroidManifest.xml b/benchmark/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/benchmark/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/integration/avif/src/main/AndroidManifest.xml b/integration/avif/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/integration/avif/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/integration/compose/src/main/AndroidManifest.xml b/integration/compose/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/integration/compose/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/integration/concurrent/src/main/AndroidManifest.xml b/integration/concurrent/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/integration/concurrent/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/integration/gifencoder/src/main/AndroidManifest.xml b/integration/gifencoder/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/integration/gifencoder/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/integration/ktx/src/main/AndroidManifest.xml b/integration/ktx/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/integration/ktx/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/integration/okhttp/src/main/AndroidManifest.xml b/integration/okhttp/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/integration/okhttp/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/integration/okhttp4/src/main/AndroidManifest.xml b/integration/okhttp4/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/integration/okhttp4/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/integration/recyclerview/src/main/AndroidManifest.xml b/integration/recyclerview/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/integration/recyclerview/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/integration/sqljournaldiskcache/src/main/AndroidManifest.xml b/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/integration/sqljournaldiskcache/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/library/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/library/test/src/main/AndroidManifest.xml b/library/test/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/library/test/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/mocks/src/main/AndroidManifest.xml b/mocks/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/mocks/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/testutil/src/main/AndroidManifest.xml b/testutil/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/testutil/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/third_party/disklrucache/src/main/AndroidManifest.xml b/third_party/disklrucache/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/third_party/disklrucache/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />
diff --git a/third_party/gif_decoder/src/main/AndroidManifest.xml b/third_party/gif_decoder/src/main/AndroidManifest.xml
deleted file mode 100644
index 8072ee00db..0000000000
--- a/third_party/gif_decoder/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest />