diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2020-02-10 11:25:46 -0500 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2020-02-10 11:25:46 -0500 |
| commit | 4a4b8bd9bd72e44f21efcff7955a6eb3deff81cb (patch) | |
| tree | 1a2e8efc3740623bbe2d74adeeae79594d8620e2 | |
| parent | 5bcd0d8dd0c5f6cb56c1d3d67771d986ec54f68a (diff) | |
| download | servo-4a4b8bd9bd72e44f21efcff7955a6eb3deff81cb.tar.gz servo-4a4b8bd9bd72e44f21efcff7955a6eb3deff81cb.zip | |
Revert "Auto merge of #25509 - jdm:angle-up, r=asajeffrey"
This reverts commit ce6204b904e62307915e0870611bad473cd48843, reversing
changes made to 904fcb4317ffd0f1ed6d0400cdb768fedacfda3d.
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | support/hololens/ServoApp/ServoApp.vcxproj | 6 | ||||
| -rw-r--r-- | support/hololens/ServoApp/packages.config | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 41952fff731..2aa70862fd6 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -790,7 +790,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.18", "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 86873e5dda8..917ec117664 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -948,7 +948,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.18\build\native\ANGLE.WindowsStore.Servo.targets" Condition="Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.18\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> @@ -958,6 +958,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.18\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.18\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> +</Project>
\ No newline at end of file diff --git a/support/hololens/ServoApp/packages.config b/support/hololens/ServoApp/packages.config index 70363c67f49..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.18" 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> +</packages>
\ No newline at end of file |