Tackling the mobile targets

Source builds fine, but when testing with Android Simulator I'm getting an early crash inside of SDL/Silk. Getting same crach when running the Silk example itself. So probably unrelated.
lionfire · May 13, 2022 · e443d1e · e443d1e
1 parent 0b98e05
commit e443d1e
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 47 deletions.
diff --git a/...Physics/Android/armeabi-v7a/libbulletc.so → ...Physics/Android/android-arm/libbulletc.so b/...Physics/Android/armeabi-v7a/libbulletc.so → ...Physics/Android/android-arm/libbulletc.so
diff --git a/...etPhysics/Android/arm64-v8a/libbulletc.so → ...ysics/Android/android-arm64/libbulletc.so b/...etPhysics/Android/arm64-v8a/libbulletc.so → ...ysics/Android/android-arm64/libbulletc.so
diff --git a/...ulletPhysics/Android/x86_64/libbulletc.so → ...Physics/Android/android-x64/libbulletc.so b/...ulletPhysics/Android/x86_64/libbulletc.so → ...Physics/Android/android-x64/libbulletc.so
diff --git a/deps/BulletPhysics/Android/x86/libbulletc.so → ...Physics/Android/android-x86/libbulletc.so b/deps/BulletPhysics/Android/x86/libbulletc.so → ...Physics/Android/android-x86/libbulletc.so
diff --git a/...eetype/Android/armeabi-v7a/libfreetype.so → ...eetype/Android/android-arm/libfreetype.so b/...eetype/Android/armeabi-v7a/libfreetype.so → ...eetype/Android/android-arm/libfreetype.so
diff --git a/...freetype/Android/arm64-v8a/libfreetype.so → ...type/Android/android-arm64/libfreetype.so b/...freetype/Android/arm64-v8a/libfreetype.so → ...type/Android/android-arm64/libfreetype.so
diff --git a/deps/freetype/Android/x86_64/libfreetype.so → ...eetype/Android/android-x64/libfreetype.so b/deps/freetype/Android/x86_64/libfreetype.so → ...eetype/Android/android-x64/libfreetype.so
diff --git a/deps/freetype/Android/x86/libfreetype.so → ...eetype/Android/android-x86/libfreetype.so b/deps/freetype/Android/x86/libfreetype.so → ...eetype/Android/android-x86/libfreetype.so
diff --git a/sources/core/Stride.Core/build/Stride.Core.targets b/sources/core/Stride.Core/build/Stride.Core.targets
@@ -160,15 +160,9 @@
         <Type>$([System.Text.RegularExpressions.Regex]::Match('%(Identity)', `(.*);(.*);(.*)`).get_Groups().get_Item(1).ToString())</Type>
         <SourcePath>$([System.Text.RegularExpressions.Regex]::Match('%(Identity)', `(.*);(.*);(.*)`).get_Groups().get_Item(2).ToString())</SourcePath>
         <Link>$([System.Text.RegularExpressions.Regex]::Match('%(Identity)', `(.*);(.*);(.*)`).get_Groups().get_Item(3).ToString())</Link>
-        <HandledByPackage>false</HandledByPackage>
         <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       </_StrideDependencyLocal>
       <_StrideDependencyNativeLib Include="@(_StrideDependencyLocal->'$(_StrideSourceDir)%(SourcePath)')" Condition="'%(_StrideDependencyLocal.Type)' == 'NativeLib'"/>
-      <!-- Mark runtimes/ as handled (NuGet will take care of copying it to output folder) -->
-      <!-- We can get rid of this once all native dependencies are handled through runtimes/ feature (mobile targets haven't been updated yet) -->
-      <_StrideDependencyNativeLib Update="@(_StrideDependencyNativeLib)" Condition="$([System.String]::new('%(_StrideDependencyNativeLib.Link)').StartsWith('runtimes\'))" >
-        <HandledByPackage>true</HandledByPackage>
-      </_StrideDependencyNativeLib>
     </ItemGroup>
 
     <!-- Message -->
@@ -180,23 +174,7 @@
       <_StrideDependencyLocal Remove="@(_StrideDependencyLocal)"/>
     </ItemGroup>
   </Target>
-
-  <!-- Copy native libraries to output -->
-  <Target Name="_StrideSetupNativeLibrariesWindows" DependsOnTargets="_StrideBuildDependencies" AfterTargets="ResolveAssemblyReferences" Condition="('$(StridePlatform)' == 'Windows' Or '$(StridePlatform)' == 'macOS' Or '$(StridePlatform)' == 'Linux') And '$(CopyLocalLockFileAssemblies)' != 'false'">
-    <ItemGroup>
-      <None Include="@(_StrideDependencyNativeLib)" Condition=" '%(_StrideDependencyNativeLib.HandledByPackage)' == 'false' ">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
-  </Target>
-  <!-- When publishing, copy native libraries (only needed if CopyLocalLockFileAssemblies is set to false since _StrideSetupNativeLibrariesWindows won't run) -->
-  <Target Name="_StrideSetupNativeLibrariesDotNetPublish" DependsOnTargets="_StrideBuildDependencies" AfterTargets="ComputeFilesToPublish" Condition="'$(UsingMicrosoftNETSdk)' == 'true' And '$(CopyLocalLockFileAssemblies)' == 'false'">
-    <ItemGroup>
-      <ResolvedFileToPublish Include="@(_StrideDependencyNativeLib)" Condition=" '%(_StrideDependencyNativeLib.HandledByPackage)' == 'false' ">
-        <RelativePath>%(_StrideDependencyNativeLib.Link)</RelativePath>
-      </ResolvedFileToPublish>
-    </ItemGroup>
-  </Target>
+
   <Target Name="_StrideSetupNativeLibrariesUWP" DependsOnTargets="_StrideBuildDependencies" AfterTargets="ResolveAssemblyReferences" Condition="'$(StridePlatform)' == 'UWP'">
     <PropertyGroup>
       <StrideCPU Condition="'$(Platform)' == 'x86'">x86</StrideCPU>

diff --git a/...ride.Assets.Presentation/Templates/Core/ProjectExecutable.Android/$ProjectName$.csproj.t4 b/...ride.Assets.Presentation/Templates/Core/ProjectExecutable.Android/$ProjectName$.csproj.t4
@@ -16,6 +16,9 @@
 
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+
+    <!-- Use AssemblyName rather than RootNamespace for Resource class otherwise it might clash between some assemblies (i.e. MyGame and MyGame.Android) -->
+    <AndroidResgenNamespace>$(AssemblyName)</AndroidResgenNamespace>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...able.Android/Resources/values/strings.xml → ...e.Android/Resources/values/strings.xml.t4 b/...able.Android/Resources/values/strings.xml → ...e.Android/Resources/values/strings.xml.t4
@@ -1,3 +1,4 @@
+<#@ template="" inherits="ProjectTemplateTransformation" language="C#" #>
 <resources>
     <string name="app_name"><#= Properties.PackageGameDisplayName #></string>
 </resources>
diff --git a/sources/native/Stride.Native.targets b/sources/native/Stride.Native.targets
diff --git a/sources/targets/Stride.Core.PostSettings.Dependencies.targets b/sources/targets/Stride.Core.PostSettings.Dependencies.targets
@@ -152,7 +152,7 @@
   </Target>
   <Target Name="_StrideRegisterPackageFiles" Condition="'$(TargetFramework)' != ''" DependsOnTargets="_StrideGenerateDependenciesCore">
     <ItemGroup Condition="'@(_StrideDependencyToCopy)' != ''">
-      <!-- Native dependencies usually go to the runtimes/RID/native folder -->
+      <!-- Native dependencies go to the runtimes/RID/native folder -->
       <TfmSpecificPackageFile Include="@(_StrideDependencyToCopy)" 
                               Condition=" '%(_StrideDependencyToCopy.Type)' == 'NativeLib' "
                               PackagePath="%(_StrideDependencyToCopy.TargetPath)" />

diff --git a/sources/targets/Stride.Core.props b/sources/targets/Stride.Core.props
@@ -165,6 +165,8 @@
     <DesignTimeBuild Condition="'$(DesignTimeBuild)' == ''">False</DesignTimeBuild>
     <!-- Use AssemblyName rather than RootNamespace for Resource class otherwise it might clash between some assemblies (i.e. Stride and Stride.Engine) -->
     <AndroidResgenNamespace>$(AssemblyName)</AndroidResgenNamespace>
+    <!-- Needs to be set to 21 as long as generated entry point projects are - otherwise user gets a lot of build warnings -->
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == '$(StrideFrameworkAndroid)' And '$(OutputType)' == 'Exe' ">
     <AndroidApplication>true</AndroidApplication>