diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-12-10 14:47:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 14:47:32 -0500 |
| commit | 47716cc1aafc03abc418f1cc918d42a469535e93 (patch) | |
| tree | eb66bb3280711143ac11badac22a57952a11e95c | |
| parent | 6cf618ae9fcc62a419ea8360520511cb5e083a94 (diff) | |
| parent | ba8c52854eb8470db0532f82a6bfae3b9fda9f22 (diff) | |
| download | servo-47716cc1aafc03abc418f1cc918d42a469535e93.tar.gz servo-47716cc1aafc03abc418f1cc918d42a469535e93.zip | |
Auto merge of #25219 - jdm:angle-uwp-up, r=paulrouget
Update ANGLE for UWP fix.
This fixes a WACK error where the ANGLE DLLs do not contain the App Container feature.
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | support/hololens/ServoApp/ServoApp.vcxproj | 4 | ||||
| -rw-r--r-- | support/hololens/ServoApp/packages.config | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 8f462939b5b..2cb269eed69 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -797,7 +797,7 @@ def angle_root(target, nuget_env): } angle_arch = arch[target.split('-')[0]] angle_default_path = path.join(os.getcwd(), "support", "hololens", "packages", - "ANGLE.WindowsStore.Servo.2.1.15", "bin", "UAP", angle_arch) + "ANGLE.WindowsStore.Servo.2.1.16", "bin", "UAP", angle_arch) # Nuget executable command nuget_app = path.join(os.getcwd(), "support", "hololens", "ServoApp.sln") diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index 60b7b540786..9a53304a3a0 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -949,7 +949,7 @@ <ImportGroup Label="ExtensionTargets"> <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" /> <Import Project="..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets" Condition="Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets')" /> - <Import Project="..\packages\ANGLE.WindowsStore.Servo.2.1.15\build\native\ANGLE.WindowsStore.Servo.targets" Condition="Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.15\build\native\ANGLE.WindowsStore.Servo.targets')" /> + <Import Project="..\packages\ANGLE.WindowsStore.Servo.2.1.16\build\native\ANGLE.WindowsStore.Servo.targets" Condition="Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.16\build\native\ANGLE.WindowsStore.Servo.targets')" /> </ImportGroup> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> @@ -959,6 +959,6 @@ <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets'))" /> <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.props'))" /> <Error Condition="!Exists('..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\OpenXR.Loader.1.0.3\build\native\OpenXR.Loader.targets'))" /> - <Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.15\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.15\build\native\ANGLE.WindowsStore.Servo.targets'))" /> + <Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.16\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.16\build\native\ANGLE.WindowsStore.Servo.targets'))" /> </Target> </Project>
\ No newline at end of file diff --git a/support/hololens/ServoApp/packages.config b/support/hololens/ServoApp/packages.config index e6ae208cc93..fa1a5cf1668 100644 --- a/support/hololens/ServoApp/packages.config +++ b/support/hololens/ServoApp/packages.config @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="ANGLE.WindowsStore.Servo" version="2.1.15" targetFramework="native" /> + <package id="ANGLE.WindowsStore.Servo" version="2.1.16" targetFramework="native" /> <package id="Microsoft.Windows.CppWinRT" version="2.0.190620.2" targetFramework="native" /> <package id="OpenXR.Loader" version="1.0.3" targetFramework="native" /> </packages>
\ No newline at end of file |