Package Update 1.6.0

Author: game-workstore-bot

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog for com.google.android.appbundle
 
+## [1.6.0] - 2021-11-15
+### New Features
+ - Updated bundletool-all.jar from 1.6.1 to 1.8.2
+### Bug Fixes
+ - Fixed issue #127: crash with IL2CPP and "Separate base APK asset" enabled
+ - Fixed issue #143: handle AssetBundle files that have file extensions
+ - Fixed issue #145: AAB upload to Play Console fails due to BundleConfig.pb file size
+ - Fixed issue when installing Android APIs using the plugin
+### Other
+ - Update minimum Target SDK version to 30
+
 ## [1.5.0] - 2021-06-14
 ### New Features
  - Added a new Bundletool method for building AABs (requires 2018.4+ and .NET 4+)

Documentation~/index.md

@@ -12,3 +12,9 @@ Refer to the
 and
 [Editor API reference](//developer.android.com/reference/unity/namespace/Google/Android/AppBundle/Editor)
 for more information.
+
+## Known Issues
+
+- The plugin's build system is incompatible with the Play Asset Delivery support built into Unity.
+  See [the Google Play Plugins for Unity README](https://github.com/google/play-unity-plugins/blob/master/README.md#built-in-pad)
+  for details.

Editor/Scripts/AssetBundleBuilder.cs

@@ -226,4 +226,4 @@ private static void CheckDirectory(string path, bool allowClearDirectory)
             directoryInfo.Delete( /* recursive= */ true);
         }
     }
-}
+}

Editor/Scripts/AssetPack.cs

@@ -45,6 +45,12 @@ public string AssetBundleFilePath
             get { return _assetBundleFilePath; }
             set
             {
+                if (value == null)
+                {
+                    _assetBundleFilePath = null;
+                    return;
+                }
+
                 if (_assetPackDirectoryPath != null)
                 {
                     throw new ArgumentException("AssetPackDirectoryPath is already set.");
@@ -75,6 +81,12 @@ public string AssetPackDirectoryPath
             get { return _assetPackDirectoryPath; }
             set
             {
+                if (value == null)
+                {
+                    _assetPackDirectoryPath = null;
+                    return;
+                }
+
                 if (_assetBundleFilePath != null)
                 {
                     throw new ArgumentException("AssetBundleFilePath is already set.");
@@ -108,6 +120,12 @@ public Dictionary<TextureCompressionFormat, string> CompressionFormatToAssetBund
             get { return _compressionFormatToAssetBundleFilePath; }
             set
             {
+                if (value == null)
+                {
+                    _compressionFormatToAssetBundleFilePath = null;
+                    return;
+                }
+
                 if (_assetBundleFilePath != null)
                 {
                     throw new ArgumentException("AssetBundleFilePath is already set.");
@@ -141,6 +159,12 @@ public Dictionary<TextureCompressionFormat, string> CompressionFormatToAssetPack
             get { return _compressionFormatToAssetPackDirectoryPath; }
             set
             {
+                if (value == null)
+                {
+                    _compressionFormatToAssetPackDirectoryPath = null;
+                    return;
+                }
+
                 if (_assetBundleFilePath != null)
                 {
                     throw new ArgumentException("AssetBundleFilePath is already set.");

Editor/Scripts/AssetPackConfig.cs

@@ -212,4 +212,4 @@ private static void CheckAssetPackName(string assetPackName)
             }
         }
     }
-}
+}

Editor/Scripts/Bundletool.cs

@@ -47,6 +47,7 @@ public static async Task<AndroidBuildReport> BuildBundle(AndroidBuildOptions and
         {
             return await AppBundlePublisher.BuildTask(androidBuildOptions);
         }
+
 #endif
 
         /// <summary>

Editor/Scripts/Internal/AndroidArchitectureHelper.cs

@@ -92,6 +92,7 @@ public static void EnableIl2CppBuildArchitectures()
 
         /// <summary>
         /// Enable the Mono scripting backend and all Android architectures supported by Mono builds.
+        /// Note: Unity 2019.4.31+ only supports x86 for IL2CPP builds.
         /// </summary>
         public static void EnableMonoBuildArchitectures()
         {
@@ -109,4 +110,4 @@ private static bool IsArchitectureEnabled(AndroidArchitecture androidArchitectur
             return (PlayerSettings.Android.targetArchitectures & androidArchitecture) == androidArchitecture;
         }
     }
-}
+}

Editor/Scripts/Internal/AppBundlePublisher.cs

@@ -87,6 +87,7 @@ public static async Task<AndroidBuildReport> BuildTask(AndroidBuildOptions andro
 
             return await appBundleBuilder.CreateBundleWithTask(androidBuildOptions);
         }
+
 #endif
 
         /// <summary>
@@ -180,7 +181,11 @@ private static bool Build(AppBundleBuilder appBundleBuilder, AppBundleBuildSetti
             var aabFilePath = buildSettings.buildPlayerOptions.locationPathName;
             if (IsBatchMode || buildSettings.forceSynchronousBuild)
             {
-                var errorMessage = appBundleBuilder.CreateBundle(aabFilePath, buildSettings.assetPackConfig);
+                var createBundleOptions = new CreateBundleOptions
+                {
+                    AabFilePath = aabFilePath, AssetPackConfig = buildSettings.assetPackConfig
+                };
+                var errorMessage = appBundleBuilder.CreateBundle(createBundleOptions);
                 return errorMessage == null;
             }
 
@@ -207,7 +212,12 @@ private static void CreateBundleAsync(
                 runOnDevice
                     ? (AppBundleBuilder.PostBuildCallback) RunBundle
                     : EditorUtility.RevealInFinder;
-            appBundleBuilder.CreateBundleAsync(aabFilePath, assetPackConfig, callback);
+
+            var createBundleOptions = new CreateBundleOptions
+            {
+                AabFilePath = aabFilePath, AssetPackConfig = assetPackConfig
+            };
+            appBundleBuilder.CreateBundleAsync(createBundleOptions, callback);
         }
 
         private static void RunBundle(string aabFile)

Editor/Scripts/Internal/BuildTools/AndroidBuilder.cs

@@ -17,9 +17,9 @@
 using Google.Android.AppBundle.Editor.Internal.AssetPacks;
 using UnityEditor;
 using UnityEngine;
-
 #if UNITY_2018_1_OR_NEWER
 using UnityEditor.Build.Reporting;
+
 #endif
 
 namespace Google.Android.AppBundle.Editor.Internal.BuildTools
@@ -108,15 +108,33 @@ public virtual bool Initialize(BuildToolLogger buildToolLogger)
                 return false;
             }
 
-            if (PlayerSettings.Android.useAPKExpansionFiles)
+            if (BuiltInPadHelper.EditorSupportsPad() && BuiltInPadHelper.ProjectHasAndroidPacks())
             {
                 var message =
-                    string.Format(
-                        "This build doesn't support APK Expansion (OBB) files.\n\nLarge games can instead use the " +
-                        "\"{0}\" option available through the \"Google > Android App Bundle > Asset Delivery " +
-                        "Settings\" menu or the AssetPackConfig API's SplitBaseModuleAssets field.\n\n" +
-                        "Click \"OK\" to disable the \"Split Application Binary\" setting.",
-                        AssetDeliveryWindow.SeparateAssetsLabel);
+                    "This build method doesn't support .androidpack folders. Assets within those folders will not be included" +
+                    " in the build.";
+                buildToolLogger.DisplayOptOutDialog(message, "androidPackError");
+            }
+
+            if (PlayerSettings.Android.useAPKExpansionFiles)
+            {
+                string messagePrefix;
+                if (BuiltInPadHelper.EditorSupportsPad())
+                {
+                    messagePrefix = "This build method doesn't support Unity's \"Split Application Binary\" option.";
+                }
+                else
+                {
+                    messagePrefix = "This build method doesn't support APK Expansion (OBB) files.";
+                }
+
+                var message = string.Format(
+                    "{0}\n\nLarge games can instead use the " +
+                    "\"{1}\" option available through the \"Google > Android App Bundle > Asset Delivery " +
+                    "Settings\" menu or the AssetPackConfig API's SplitBaseModuleAssets field.\n\n" +
+                    "Click \"OK\" to disable the \"Split Application Binary\" setting.",
+                    messagePrefix,
+                    AssetDeliveryWindow.SeparateAssetsLabel);
                 if (buildToolLogger.DisplayActionableErrorDialog(message))
                 {
                     PlayerSettings.Android.useAPKExpansionFiles = false;

Editor/Scripts/Internal/BuildTools/AndroidSdk.cs

@@ -30,8 +30,16 @@ public class AndroidSdk : IBuildTool
         public const string AndroidHomeEnvironmentVariableKey = "ANDROID_HOME";
 
         private const string AndroidNdkHomeEnvironmentVariableKey = "ANDROID_NDK_HOME";
+
+        /// <summary>
+        /// The environment variable key we use when overriding existing Unity editor preferences.
+        /// We use UNITY_JAVA_HOME instead of JAVA_HOME because Unity will override JAVA_HOME to match it's editor preferences.
+        /// </summary>
+        private const string JavaHomeEnvironmentVariableKey = "UNITY_JAVA_HOME";
         private const string AndroidSdkRootEditorPrefsKey = "AndroidSdkRoot";
         private const string AndroidNdkRootEditorPrefsKey = "AndroidNdkRoot";
+        private const string JdkPathEditorPrefsKey = "JdkPath";
+        private const string JdkUseEmbeddedEditorPrefsKey = "JdkUseEmbedded";
 
         private string _androidSdkRoot;
 
@@ -81,7 +89,7 @@ public virtual string RootPath
         }
 
         /// <summary>
-        /// Override the AndroidSdkRoot/AndroidNdkRoot EditorPrefs with corresponding environment variables.
+        /// Override the AndroidSdkRoot/AndroidNdkRoot/JdkPath EditorPrefs with corresponding environment variables.
         /// This is especially helpful for automated builds where the preferences may not be set.
         /// </summary>
         public static void OverrideEditorPreferences()
@@ -95,16 +103,28 @@ public static void OverrideEditorPreferences()
             OverrideEditorPreference(AndroidNdkHomeEnvironmentVariableKey,
                 () => UnityEditor.Android.AndroidExternalToolsSettings.ndkRootPath,
                 v => { UnityEditor.Android.AndroidExternalToolsSettings.ndkRootPath = v; });
+            OverrideEditorPreference(JavaHomeEnvironmentVariableKey,
+                () => UnityEditor.Android.AndroidExternalToolsSettings.jdkRootPath,
+                v => { UnityEditor.Android.AndroidExternalToolsSettings.jdkRootPath = v; });
 #else
             OverrideEditorPreference(AndroidHomeEnvironmentVariableKey,
                 () => EditorPrefs.GetString(AndroidSdkRootEditorPrefsKey),
                 v => { EditorPrefs.SetString(AndroidSdkRootEditorPrefsKey, v); });
             OverrideEditorPreference(AndroidNdkHomeEnvironmentVariableKey,
                 () => EditorPrefs.GetString(AndroidNdkRootEditorPrefsKey),
                 v => { EditorPrefs.SetString(AndroidNdkRootEditorPrefsKey, v); });
+
+            OverrideEditorPreference(JavaHomeEnvironmentVariableKey,
+                () => EditorPrefs.GetString(JdkPathEditorPrefsKey),
+                v => { EditorPrefs.SetString(JdkPathEditorPrefsKey, v); });
+
+            // Older versions of Unity have an additional boolean preference that must be disabled.
+            // Otherwise, Unity will use the JDK installed with the editor instead of the path we set in EditorPrefs.
+            EditorPrefs.SetInt(JdkUseEmbeddedEditorPrefsKey, 0);
 #endif
         }
 
+        // TODO(b/189958664): Move this to a helper class and move the JDK portion of OverrideEditorPreferences into JavaUtils.
         private static void OverrideEditorPreference(
             string environmentVariableKey, Func<string> getPreference, Action<string> setPreference)
         {