From c01358b91f7483d6f32cbe56d25f042bdef16cb5 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 14 Jul 2016 13:48:08 +0100 Subject: [PATCH] Applications crashing on startup due to java.io.IOException: No original dex files found Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=42521 Recent changes to the AddFiles method in LibZipSharp ment that the fix to strip the path of the classes.dex file was reverted. This commit fixes that. We bump LibZipSharp to bring in a fix where if we do not supply a path and useFilenamesPath is false we only use the Filename for the zip. --- external/LibZipSharp | 2 +- src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/LibZipSharp b/external/LibZipSharp index d595ce24a02..5f43e4f89d7 160000 --- a/external/LibZipSharp +++ b/external/LibZipSharp @@ -1 +1 @@ -Subproject commit d595ce24a02b35989afe8e8087a238133ff679c2 +Subproject commit 5f43e4f89d79d9dc80c7f4ae313c4c83f7a1692c diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs index 4a1b2dcd60e..653e519819a 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs @@ -115,7 +115,7 @@ void ExecuteWithAbi (string supportedAbis, string apkInputPath, string apkOutput Assembly.GetExecutingAssembly ().GetManifestResourceStream ("NOTICE.txt")); // Add classes.dx - apk.AddFiles (DalvikClasses); + apk.AddFiles (DalvikClasses, useFileDirectories: false); if (EmbedAssemblies && !BundleAssemblies) AddAssemblies (apk);