From e0c2ba7e14eceb0e26173d48417f8081b1a4e8f3 Mon Sep 17 00:00:00 2001
From: Egor Bogatov <egorbo@gmail.com>
Date: Wed, 30 Sep 2020 12:44:55 +0300
Subject: [PATCH] fix android sample (#42859)

---
 src/mono/netcore/sample/Android/AndroidSampleApp.csproj        | 4 ++--
 tools-local/tasks/mobile.tasks/AndroidAppBuilder/ApkBuilder.cs | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj
index b5cc098..c5949f7 100644
--- a/src/mono/netcore/sample/Android/AndroidSampleApp.csproj
+++ b/src/mono/netcore/sample/Android/AndroidSampleApp.csproj
@@ -32,11 +32,11 @@
       <StripDebugSymbols>False</StripDebugSymbols>
       <StripDebugSymbols Condition="'$(Configuration)' == 'Release'">True</StripDebugSymbols>
       <AdbTool>$(ANDROID_SDK_ROOT)\platform-tools\adb</AdbTool>
-      <ApkDir>$(OutputPath)apk</ApkDir>
+      <ApkDir>$(OutputPath)apk\</ApkDir>
     </PropertyGroup>
 
     <ItemGroup>
-      <AssemblySearchPaths Include="bin" />
+      <AssemblySearchPaths Include="$(OutputPath)" />
       <AssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackDir)native"/>
       <AssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackDir)lib\$(NetCoreAppCurrent)"/>
     </ItemGroup>
diff --git a/tools-local/tasks/mobile.tasks/AndroidAppBuilder/ApkBuilder.cs b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/ApkBuilder.cs
index 3fd4ff8..47cc025 100644
--- a/tools-local/tasks/mobile.tasks/AndroidAppBuilder/ApkBuilder.cs
+++ b/tools-local/tasks/mobile.tasks/AndroidAppBuilder/ApkBuilder.cs
@@ -229,7 +229,8 @@ public class ApkBuilder
         Utils.RunProcess(aapt, $"package -f -m -F {apkFile} -A assets -M AndroidManifest.xml -I {androidJar}", workingDir: OutputDir);
 
         var dynamicLibs = new List<string>();
-        dynamicLibs.AddRange(Directory.GetFiles(sourceDir, "*.so"));
+        dynamicLibs.Add(Path.Combine(OutputDir, "monodroid", "libmonodroid.so"));
+        dynamicLibs.AddRange(Directory.GetFiles(sourceDir, "*.so").Where(file => Path.GetFileName(file) != "libmonodroid.so"));
 
         // add all *.so files to lib/%abi%/
         Directory.CreateDirectory(Path.Combine(OutputDir, "lib", abi));
-- 
2.7.4