Skip to content

Commit 0d995bb

Browse files
committed
fixes to mobile failures
1 parent 2217fe6 commit 0d995bb

4 files changed

Lines changed: 38 additions & 4 deletions

File tree

‎.yamato/mobile-standalone-test.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,10 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
9191
- command: wget http://artifactory-slo.bf.unity3d.com/artifactory/mobile-generic/android/ADBKeys.zip!/adbkey -O %USERPROFILE%/.android/adbkey
9292
- command: gsudo NetSh Advfirewall set allprofiles state off
9393

94-
# Connect to Android device
95-
- command: '"%ANDROID_SDK_ROOT%\platform-tools\adb.exe" connect %BOKKEN_DEVICE_IP%'
96-
97-
# Run tests for Android devices
94+
# Connect to Android device and run tests
9895
- |
96+
set ANDROID_SDK_ROOT=%CD%\.Editor\Data\PlaybackEngines\AndroidPlayer\SDK
97+
"%ANDROID_SDK_ROOT%\platform-tools\adb.exe" connect %BOKKEN_DEVICE_IP% || exit /b 1
9998
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
10099
UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --artifacts-path=test-results --player-load-path=build/players --testproject={{ project.path }} --editor-location=.Editor --player-connection-ip=%BOKKEN_HOST_IP% --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}
101100
{% else %}

‎testproject/Assets/Editor.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#if UNITY_IOS
2+
using UnityEditor;
3+
using UnityEditor.Build;
4+
using UnityEditor.Build.Reporting;
5+
6+
// Keeps the Debug IL2CPP GameAssembly within the arm64 linker's +/-128MB branch range.
7+
public class IOSBuildPreprocessor : IPreprocessBuildWithReport
8+
{
9+
public int callbackOrder => 0;
10+
11+
public void OnPreprocessBuild(BuildReport report)
12+
{
13+
PlayerSettings.SetIl2CppCodeGeneration(NamedBuildTarget.iOS, Il2CppCodeGeneration.OptimizeSize);
14+
}
15+
}
16+
#endif

‎testproject/Assets/Editor/IOSBuildPreprocessor.cs.meta‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)