Added option to auto-resolve Android libraries on build.

*If* Callbacks.PostProcessSceneAttribute(0) is called before the Android build
(Unity version specific) Android auto-resolution will run if it's enabled.
This adds a setting to that will enable / disable resolution during the build
process without affecting interactive auto-resolution.

Fixes googlesamples#196

Bug: 132072419
Change-Id: Idba8ffa249952b2288adc6653f11458b5089725f

Author: Stewart Miles

source/PlayServicesResolver/src/PlayServicesPreBuild.cs

@@ -18,7 +18,7 @@ private static void WarnIfAutoResolveDisabled() {
                 return;
 
             if (SettingsDialog.AutoResolutionDisabledWarning &&
-                !SettingsDialog.EnableAutoResolution) {
+                !(SettingsDialog.EnableAutoResolution || SettingsDialog.AutoResolveOnBuild)) {
                 Debug.LogWarning("Warning: Auto-resolution of Android dependencies is disabled! " +
                                  "Ensure you have run the resolver manually." +
                                  "\n\nWith auto-resolution of Android dependencies disabled you " +
@@ -41,4 +41,4 @@ private static void BuildComplete(BuildTarget target, string pathToBuiltProject)
             HasWarned = false;
         }
     }
-}
+}

source/PlayServicesResolver/src/PlayServicesResolver.cs

@@ -880,7 +880,9 @@ private static void OnPostProcessScene() {
             if (UnityEngine.Application.isPlaying) return;
             // If the Android resolver isn't enabled or automatic resolution is disabled,
             // do nothing.
-            if (Resolver == null || !Resolver.AutomaticResolutionEnabled()) return;
+            if (Resolver == null || !GooglePlayServices.SettingsDialog.AutoResolveOnBuild) {
+                return;
+            }
             // If post-processing has already been executed since this module was loaded, don't
             // do so again.
             scenesProcessed++;

source/PlayServicesResolver/src/SettingsDialog.cs

@@ -30,6 +30,7 @@ public class SettingsDialog : EditorWindow {
         /// </summary>
         private class Settings {
             internal bool enableAutoResolution;
+            internal bool autoResolveOnBuild;
             internal bool useGradleDaemon;
             internal bool installAndroidPackages;
             internal string packageDir;
@@ -45,6 +46,7 @@ private class Settings {
             /// </summary>
             internal Settings() {
                 enableAutoResolution = SettingsDialog.EnableAutoResolution;
+                autoResolveOnBuild = SettingsDialog.AutoResolveOnBuild;
                 useGradleDaemon = SettingsDialog.UseGradleDaemon;
                 installAndroidPackages = SettingsDialog.InstallAndroidPackages;
                 packageDir = SettingsDialog.PackageDir;
@@ -62,6 +64,7 @@ internal Settings() {
             internal void Save() {
                 SettingsDialog.UseGradleDaemon = useGradleDaemon;
                 SettingsDialog.EnableAutoResolution = enableAutoResolution;
+                SettingsDialog.AutoResolveOnBuild = autoResolveOnBuild;
                 SettingsDialog.InstallAndroidPackages = installAndroidPackages;
                 if (SettingsDialog.ConfigurablePackageDir) SettingsDialog.PackageDir = packageDir;
                 SettingsDialog.ExplodeAars = explodeAars;
@@ -75,6 +78,7 @@ internal void Save() {
 
         const string Namespace = "GooglePlayServices.";
         private const string AutoResolveKey = Namespace + "AutoResolverEnabled";
+        private const string AutoResolveOnBuildKey = Namespace + "AutoResolveOnBuild";
         private const string PackageInstallKey = Namespace + "AndroidPackageInstallationEnabled";
         private const string PackageDirKey = Namespace + "PackageDirectory";
         private const string ExplodeAarsKey = Namespace + "ExplodeAars";
@@ -89,6 +93,7 @@ internal void Save() {
         // List of preference keys, used to restore default settings.
         private static string[] PreferenceKeys = new[] {
             AutoResolveKey,
+            AutoResolveOnBuildKey,
             PackageInstallKey,
             PackageDirKey,
             ExplodeAarsKey,
@@ -133,6 +138,13 @@ internal static bool EnableAutoResolution {
             get { return projectSettings.GetBool(AutoResolveKey, true); }
         }
 
+        internal static bool AutoResolveOnBuild {
+            set {
+                projectSettings.SetBool(AutoResolveOnBuildKey, value);
+            }
+            get { return projectSettings.GetBool(AutoResolveOnBuildKey, true); }
+        }
+
         internal static bool UseGradleDaemon {
             private set { projectSettings.SetBool(UseGradleDaemonKey, value); }
             get { return projectSettings.GetBool(UseGradleDaemonKey, false); }
@@ -179,7 +191,7 @@ internal static bool UseProjectSettings {
         // Whether AARs that use variable expansion should be exploded when Gradle builds are
         // enabled.
         internal static bool ExplodeAars {
-            private set { projectSettings.SetBool(ExplodeAarsKey, value); }
+            set { projectSettings.SetBool(ExplodeAarsKey, value); }
             get { return projectSettings.GetBool(ExplodeAarsKey, true); }
         }
 
@@ -231,7 +243,7 @@ internal static string ValidatePackageDir(string directory) {
         }
 
         public void Initialize() {
-            minSize = new Vector2(350, 425);
+            minSize = new Vector2(425, 445);
             position = new Rect(UnityEngine.Screen.width / 3, UnityEngine.Screen.height / 3,
                                 minSize.x, minSize.y);
         }
@@ -265,6 +277,19 @@ public void OnGUI() {
             GUILayout.Label("Enable Auto-Resolution", EditorStyles.boldLabel);
             settings.enableAutoResolution = EditorGUILayout.Toggle(settings.enableAutoResolution);
             GUILayout.EndHorizontal();
+            GUILayout.Label(
+                settings.enableAutoResolution ?
+                ("Android libraries will be downloaded and processed in the editor.") :
+                ("Android libraries will *not* be downloaded or processed in the editor."));
+
+            GUILayout.BeginHorizontal();
+            GUILayout.Label("Enable Resolution On Build", EditorStyles.boldLabel);
+            settings.autoResolveOnBuild = EditorGUILayout.Toggle(settings.autoResolveOnBuild);
+            GUILayout.EndHorizontal();
+            GUILayout.Label(
+                settings.autoResolveOnBuild ?
+                ("Android libraries will be downloaded and processed in a pre-build step.") :
+                ("Android libraries will *not* be downloaded or processed in a pre-build step."));
 
             GUILayout.BeginHorizontal();
             GUILayout.Label("Install Android Packages", EditorStyles.boldLabel);
@@ -308,7 +333,8 @@ public void OnGUI() {
 
             // Disable the ability to toggle the auto-resolution disabled warning
             // when auto resolution is enabled.
-            EditorGUI.BeginDisabledGroup(settings.enableAutoResolution);
+            EditorGUI.BeginDisabledGroup(settings.enableAutoResolution ||
+                                         settings.autoResolveOnBuild);
             GUILayout.BeginHorizontal();
             GUILayout.Label("Auto-Resolution Disabled Warning", EditorStyles.boldLabel);
             settings.autoResolutionDisabledWarning =