Auto merge of #23878 - jdm:gst-arm64, r=asajeffrey

Fix ARM64 app startup

I missed a DLL in the ARM64 app configuration, so currently it fails to start up. With this change I verified that https://joshmatthews.net/osc.html and https://joshmatthews.net/mp3.html produce audio output on a Windows arm64 laptop.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because no windows arm64 CI.

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23878)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-07-28 17:37:16 -04:00 committed by GitHub
commit 89bade45b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions

View file

@ -82,7 +82,7 @@
<GenerateAppInstallerFile>False</GenerateAppInstallerFile> <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision> <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle> <AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x64</AppxBundlePlatforms> <AppxBundlePlatforms>arm64</AppxBundlePlatforms>
<AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency> <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
<AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency> <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
</PropertyGroup> </PropertyGroup>
@ -284,6 +284,9 @@
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\gstrtsp-1.0-0.dll"> <None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\gstrtsp-1.0-0.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
</None> </None>
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\gstsdp-1.0-0.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\gsttag-1.0-0.dll"> <None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\gsttag-1.0-0.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</DeploymentContent>
</None> </None>
@ -455,6 +458,9 @@
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\gstrtsp-1.0-0.dll"> <None Include="..\..\..\target\aarch64-pc-windows-msvc\release\gstrtsp-1.0-0.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None> </None>
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\gstsdp-1.0-0.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None>
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\gsttag-1.0-0.dll"> <None Include="..\..\..\target\aarch64-pc-windows-msvc\release\gsttag-1.0-0.dll">
<DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent> <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</DeploymentContent>
</None> </None>

View file

@ -774,6 +774,12 @@
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\z-1.dll"> <None Include="..\..\..\target\aarch64-pc-windows-msvc\release\z-1.dll">
<Filter>ReleaseARM64ServoDLLs</Filter> <Filter>ReleaseARM64ServoDLLs</Filter>
</None> </None>
<None Include="..\..\..\target\aarch64-pc-windows-msvc\release\gstsdp-1.0-0.dll">
<Filter>ReleaseARM64ServoDLLs</Filter>
</None>
<None Include="..\..\..\target\aarch64-pc-windows-msvc\debug\gstsdp-1.0-0.dll">
<Filter>DebugARM64ServoDLLs</Filter>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Assets"> <Filter Include="Assets">