Unity 2018.1 updates.

superunitybuild · Apr 25, 2018 · e600119 · e600119
1 parent 8dfd950
commit e600119
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/Editor/Build/BuildProject.cs b/Editor/Build/BuildProject.cs
@@ -315,8 +315,15 @@ private static bool BuildPlayer(string notification, BuildReleaseType releaseTyp
 
         // Build player.
         FileUtil.DeleteFileOrDirectory(buildPath);
-        string error = BuildPipeline.BuildPlayer(releaseType.sceneList.GetSceneFileList(), Path.Combine(buildPath, exeName), architecture.target, options);
 
+        string error = "";
+#if UNITY_2018_1_OR_NEWER
+        UnityEditor.Build.Reporting.BuildReport buildReport = BuildPipeline.BuildPlayer(releaseType.sceneList.GetSceneFileList(), Path.Combine(buildPath, exeName), architecture.target, options);
+        if (buildReport.summary.result == UnityEditor.Build.Reporting.BuildResult.Failed)
+            error = buildReport.summary.totalErrors + " occurred.";
+#else
+        error = BuildPipeline.BuildPlayer(releaseType.sceneList.GetSceneFileList(), Path.Combine(buildPath, exeName), architecture.target, options);
+#endif
         if (!string.IsNullOrEmpty(error))
         {
             success = false;

diff --git a/Editor/Build/Platform/BuildAndroid.cs b/Editor/Build/Platform/BuildAndroid.cs
@@ -65,7 +65,11 @@ public override void ApplyVariant()
 
     private void SetDeviceType(string key)
     {
+#if UNITY_2018_1_OR_NEWER
+        PlayerSettings.Android.targetArchitectures = (AndroidArchitecture)System.Enum.Parse(typeof(AndroidArchitecture), key);
+#else
         PlayerSettings.Android.targetDevice = (AndroidTargetDevice)System.Enum.Parse(typeof(AndroidTargetDevice), key);
+#endif
     }
 
     private void SetTextureCompression(string key)