Skip to content

Commit 4932390

Browse files
committed
Explode Aar option applies to all cases
Before this change, `Explode Aar` option in Android Resolver settings only applies when `Export Project` build setting is enabled, while Android Resolver always explode Aar libraries when the build setting is disabled. This changes `Explode Aar` option to be applied no matter `Export Project` build setting is enabled or not. It is still recommended to enable this option for older version of Unity (5 to 2018) since certain version of Unity may generate broken Gradle project.
1 parent 827d351 commit 4932390

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

source/AndroidResolver/src/GradleResolver.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ internal static bool ShouldProcess(string aarDirectory) {
11611161
// To work around this when Gradle builds are enabled, explosion is enabled for all
11621162
// AARs that require variable expansion unless this behavior is explicitly disabled
11631163
// in the settings dialog.
1164-
if (PlayServicesResolver.GradleProjectExportEnabled && !SettingsDialog.ExplodeAars) {
1164+
if (!SettingsDialog.ExplodeAars) {
11651165
return false;
11661166
}
11671167
// If this version of Unity doesn't support AAR files, always explode.

source/AndroidResolver/src/SettingsDialog.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,8 +442,8 @@ public void OnGUI() {
442442
"AndroidManifest.xml or a single target ABI is selected " +
443443
"without a compatible build system.");
444444
} else {
445-
GUILayout.Label("AAR explosion will be disabled in exported Gradle builds " +
446-
"(Unity 5.5 and above). You will need to set " +
445+
GUILayout.Label("AAR explosion will be disabled." +
446+
"You may need to set " +
447447
"android.defaultConfig.applicationId to your bundle ID in your " +
448448
"build.gradle to generate a functional APK.");
449449
}

0 commit comments

Comments
 (0)