Merge pull request #7594 from thunderbird/fix-release-build

Fix release build
thunderbird · Feb 1, 2024 · b7dcbce · b7dcbce
2 parents 022b57e + d4b29cf
commit b7dcbce
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/app-k9mail/src/main/AndroidManifest.xml b/app-k9mail/src/main/AndroidManifest.xml
@@ -1,9 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:installLocation="auto">
 
     <application
         android:name="app.k9mail.K9App"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name" />
+        android:label="@string/app_name" >
+
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+
+            <!-- We're using on-demand initialization for WorkManager -->
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+
+        </provider>
+
+    </application>
 </manifest>
diff --git a/app/common/src/main/AndroidManifest.xml b/app/common/src/main/AndroidManifest.xml
@@ -366,19 +366,5 @@
             </intent-filter>
         </activity>
 
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-
-            <!-- We're using on-demand initialization for WorkManager -->
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
-
-        </provider>
-
     </application>
 </manifest>
diff --git a/app/ui/legacy/src/main/res/raw-ja/changelog.xml b/app/ui/legacy/src/main/res/raw-ja/changelog.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<changelog>
+<changelog
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingDefaultResource"
+    >
     <release version="4.904" versioncode="21007" >
         <change>OpenPGP API v3サポートを追加しました</change>
         <change>IMAPログインの問題を修正しました</change>