Skip to content

Commit 6858f73

Browse files
author
Stewart Miles
committed
Re-enable AAR explosion if internal builds are enabled.
With AAR explosion disabled, builds are very likely to fail with Unity's internal build system. This patch re-enables AAR explosion on resolution when the internal build system is used. Fixes #100 Bug: 132070411 Change-Id: Ib2858910e3497c43eb9b1c9e06f7ec632227d8f0
1 parent fdcbb36 commit 6858f73

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

source/PlayServicesResolver/src/PlayServicesResolver.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,6 +1405,16 @@ private static void ResolveUnsafe(Action<bool> resolutionComplete = null,
14051405

14061406
DeleteFiles(Resolver.OnBuildSettings());
14071407

1408+
// If the internal build system is being used and AAR explosion is disabled the build
1409+
// is going to fail so warn and enable explosion.
1410+
if (!AndroidBuildSystemSettings.Current.GradleBuildEnabled &&
1411+
!GooglePlayServices.SettingsDialog.ExplodeAars) {
1412+
Log("AAR explosion *must* be enabled when the internal build " +
1413+
"system is selected, otherwise the build will very likely fail. " +
1414+
"Enabling the 'explode AARs' setting.", level: LogLevel.Warning);
1415+
GooglePlayServices.SettingsDialog.ExplodeAars = true;
1416+
}
1417+
14081418
xmlDependencies.ReadAll(logger);
14091419

14101420
// If no dependencies are present, skip the resolution step.

0 commit comments

Comments
 (0)