Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Android] Fix UnityThemeSelector error due to missing files in unityLibrary/src/android/res #894

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Android] Fix UnityThemeSelector error due to missing files in unityLibrary/src/android/res #894

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a4b657
Move copy into DoBuildAndroid to reduce duplicate code.
timbotimbo Nov 5, 2023
924fe1c
Don't delete destination folder when copying android launcher files.
timbotimbo Nov 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 5 additions & 11 deletions example/unity/DemoApp/Assets/FlutterUnityIntegration/Editor/Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,18 @@ public class Build : EditorWindow
public static void DoBuildAndroidLibraryDebug()
{
DoBuildAndroid(Path.Combine(APKPath, "unityLibrary"), false, false);

// Copy over resources from the launcher module that are used by the library
Copy(Path.Combine(APKPath + "/launcher/src/main/res"), Path.Combine(AndroidExportPath, "src/main/res"));
}

[MenuItem("Flutter/Export Android (Release) %&m", false, 102)]
public static void DoBuildAndroidLibraryRelease()
{
DoBuildAndroid(Path.Combine(APKPath, "unityLibrary"), false, true);

// Copy over resources from the launcher module that are used by the library
Copy(Path.Combine(APKPath + "/launcher/src/main/res"), Path.Combine(AndroidExportPath, "src/main/res"));
}

[MenuItem("Flutter/Export Android Plugin %&p", false, 103)]
public static void DoBuildAndroidPlugin()
{
DoBuildAndroid(Path.Combine(APKPath, "unityLibrary"), true, true);

// Copy over resources from the launcher module that are used by the library
Copy(Path.Combine(APKPath + "/launcher/src/main/res"), Path.Combine(AndroidExportPath, "src/main/res"));
}

[MenuItem("Flutter/Export IOS (Debug) %&i", false, 201)]
Expand Down Expand Up @@ -238,6 +229,9 @@ private static void DoBuildAndroid(String buildPath, bool isPlugin, bool isRelea
SetupAndroidProject();
}

// Copy over resources from the launcher module that are used by the library, Avoid deleting the existing src/main/res contents.
Copy(Path.Combine(APKPath + "/launcher/src/main/res"), Path.Combine(AndroidExportPath, "src/main/res"), false);

if (isReleaseBuild) {
Debug.Log($"-- Android Release Build: SUCCESSFUL --");
} else
Expand Down Expand Up @@ -450,9 +444,9 @@ private static void BuildIOS(String path, bool isReleaseBuild)


//#region Other Member Methods
private static void Copy(string source, string destinationPath)
private static void Copy(string source, string destinationPath, bool clearDestination = true)
{
if (Directory.Exists(destinationPath))
if (clearDestination && Directory.Exists(destinationPath))
Directory.Delete(destinationPath, true);

Directory.CreateDirectory(destinationPath);
Expand Down