diff --git a/Tools/ApkUncompress/ApkUncompressCommon.cs b/Tools/ApkUncompress/ApkUncompressCommon.cs index 40c11fe49..dd7bf7462 100644 --- a/Tools/ApkUncompress/ApkUncompressCommon.cs +++ b/Tools/ApkUncompress/ApkUncompressCommon.cs @@ -157,15 +157,22 @@ public bool UncompressFromAPK_IndividualElfFiles(ZipFile apk, string filePath, s continue; } - string outputFile = assemblyFileName; - if (!string.IsNullOrEmpty(entryPath)) + if (!string.IsNullOrEmpty(cultureDir)) { - outputFile = Path.Combine(entryPath, outputFile); + if (string.IsNullOrEmpty(entryPath)) + { + entryPath = cultureDir; + } + else + { + entryPath = Path.Combine(entryPath, cultureDir); + } } - if (!string.IsNullOrEmpty(cultureDir)) + string outputFile = assemblyFileName; + if (!string.IsNullOrEmpty(entryPath)) { - outputFile = Path.Combine(cultureDir, outputFile); + outputFile = Path.Combine(entryPath, outputFile); } if (!string.IsNullOrEmpty(prefix))