From ef02390143ac8775d2662d55958af5917b2946f3 Mon Sep 17 00:00:00 2001 From: "haruto.otake" Date: Mon, 19 Feb 2024 12:52:29 +0900 Subject: [PATCH 1/2] apply patch https://github.com/google/play-unity-plugins/pull/226 --- .../Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/GooglePlayPlugins/com.google.android.appbundle/Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs b/GooglePlayPlugins/com.google.android.appbundle/Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs index 3fb6bc66..2a11583a 100644 --- a/GooglePlayPlugins/com.google.android.appbundle/Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs +++ b/GooglePlayPlugins/com.google.android.appbundle/Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs @@ -760,7 +760,13 @@ private void MoveSymbolsZipFile(string aabFilePath) private string GetSymbolsFileName(string prefix) { +#if UNITY_2022_1_OR_NEWER + // Unity 2022 started adding the scripting backend to the symbol zip's name + var scriptingBackend = PlayerSettings.GetScriptingBackend(UnityEditor.Build.NamedBuildTarget.Android); + return string.Format("{0}-{1}-v{2}-{3}.symbols.zip", prefix, _versionName, _versionCode, scriptingBackend); +#else return string.Format("{0}-{1}-v{2}.symbols.zip", prefix, _versionName, _versionCode); +#endif } private static void CopyFilesRecursively(DirectoryInfo sourceDirectory, DirectoryInfo destinationDirectory) From 2b5d6db835eb17f68879362a26bb0d36d1691c32 Mon Sep 17 00:00:00 2001 From: "haruto.otake" Date: Mon, 19 Feb 2024 13:02:43 +0900 Subject: [PATCH 2/2] cache PlayerSettings.GetScriptingBackend for access from sub threads --- .../Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/GooglePlayPlugins/com.google.android.appbundle/Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs b/GooglePlayPlugins/com.google.android.appbundle/Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs index 2a11583a..b8c18774 100644 --- a/GooglePlayPlugins/com.google.android.appbundle/Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs +++ b/GooglePlayPlugins/com.google.android.appbundle/Editor/Scripts/Internal/BuildTools/AppBundleBuilder.cs @@ -90,6 +90,7 @@ private enum BuildStatus private string _packageName; private int _versionCode; private string _versionName; + private ScriptingImplementation _scriptingBackend; private PostBuildCallback _createBundleAsyncOnSuccess = delegate { }; private IEnumerable _assetPackManifestTransformers; @@ -119,6 +120,7 @@ public virtual bool Initialize(BuildToolLogger buildToolLogger) _packageName = PlayerSettings.GetApplicationIdentifier(BuildTargetGroup.Android); _versionCode = PlayerSettings.Android.bundleVersionCode; _versionName = PlayerSettings.bundleVersion; + _scriptingBackend = PlayerSettings.GetScriptingBackend(BuildTargetGroup.Android); _assetPackManifestTransformers = AssetPackManifestTransformerRegistry.Registry.ConstructInstances(); var initializedManifestTransformers = true; @@ -762,8 +764,7 @@ private string GetSymbolsFileName(string prefix) { #if UNITY_2022_1_OR_NEWER // Unity 2022 started adding the scripting backend to the symbol zip's name - var scriptingBackend = PlayerSettings.GetScriptingBackend(UnityEditor.Build.NamedBuildTarget.Android); - return string.Format("{0}-{1}-v{2}-{3}.symbols.zip", prefix, _versionName, _versionCode, scriptingBackend); + return string.Format("{0}-{1}-v{2}-{3}.symbols.zip", prefix, _versionName, _versionCode, _scriptingBackend); #else return string.Format("{0}-{1}-v{2}.symbols.zip", prefix, _versionName, _versionCode); #endif