Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

Updating Google VR to v1.180 #517

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Updating Google VR to v1.180 #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd11e07
Update Android to 1.180 packge
Jan 31, 2019
2550fce
Updated iOS binding to 1.170
Jan 31, 2019
b6a907d
Updated xpaths to replace the EventTypes
Feb 1, 2019
26b8fb6
Fixed issues with Event Type
Feb 5, 2019
ff45735
Added action rewrites too
Feb 5, 2019
4e98b9a
Update metadata to remove finalize methods
Feb 5, 2019
f621ee8
Updated to Android 7.1
Feb 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ externals
*.userprefs
.vs/
tmpnupkg/

.user
.DS_Store
XPlat/DropboxApiV2/samples/DropboxV2ApiSampleDroid/.vs/DropboxV2ApiSampleDroid/xs/UserPrefs.xml

Expand Down
18 changes: 9 additions & 9 deletions XPlat/GoogleVR/Android/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

var TARGET = Argument ("t", Argument ("target", "Default"));

var ANDROID_VERSION = "0954a01934199b8536755f06688d98e3d2a958e4";
var ANDROID_NUGET_VERSION = "0.8.0-beta1";
var ANDROID_VERSION = "25a0c20415bd3854b76f3e0e55f73d36cdc076fd";
var ANDROID_NUGET_VERSION = "1.180.0";
var ANDROID_URL = string.Format ("https://github.com/googlevr/gvr-android-sdk/archive/{0}.zip", ANDROID_VERSION);

var buildSpec = new BuildSpec {
Expand Down Expand Up @@ -44,13 +44,13 @@ Task ("externals")
Unzip ("./externals/android.zip", "./externals");
CopyDirectory ("./externals/gvr-android-sdk-" + ANDROID_VERSION, "./externals/android");
DeleteDirectory ("./externals/gvr-android-sdk-" + ANDROID_VERSION, true);
Unzip ("./externals/android/libraries/audio/audio.aar", "./externals/android/libraries/audio");
Unzip ("./externals/android/libraries/base/base.aar", "./externals/android/libraries/base");
Unzip ("./externals/android/libraries/common/common.aar", "./externals/android/libraries/common");
Unzip ("./externals/android/libraries/commonwidget/commonwidget.aar", "./externals/android/libraries/commonwidget");
Unzip ("./externals/android/libraries/controller/controller.aar", "./externals/android/libraries/controller");
Unzip ("./externals/android/libraries/panowidget/panowidget.aar", "./externals/android/libraries/panowidget");
Unzip ("./externals/android/libraries/videowidget/videowidget.aar", "./externals/android/libraries/videowidget");
Unzip ($"./externals/android/libraries/sdk-audio-{ANDROID_NUGET_VERSION}.aar", "./externals/android/libraries/audio");
Unzip ($"./externals/android/libraries/sdk-base-{ANDROID_NUGET_VERSION}.aar", "./externals/android/libraries/base");
Unzip ($"./externals/android/libraries/sdk-common-{ANDROID_NUGET_VERSION}.aar", "./externals/android/libraries/common");
Unzip ($"./externals/android/libraries/sdk-commonwidget-{ANDROID_NUGET_VERSION}.aar", "./externals/android/libraries/commonwidget");
Unzip ($"./externals/android/libraries/sdk-controller-{ANDROID_NUGET_VERSION}.aar", "./externals/android/libraries/controller");
Unzip ($"./externals/android/libraries/sdk-panowidget-{ANDROID_NUGET_VERSION}.aar", "./externals/android/libraries/panowidget");
Unzip ($"./externals/android/libraries/sdk-videowidget-{ANDROID_NUGET_VERSION}.aar", "./externals/android/libraries/videowidget");

});

Expand Down
1 change: 1 addition & 0 deletions XPlat/GoogleVR/Android/source/Google.VR.Android/Audio/Audio.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AndroidCodeGenTarget>XAJavaInterop1</AndroidCodeGenTarget>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
3 changes: 2 additions & 1 deletion XPlat/GoogleVR/Android/source/Google.VR.Android/Base/Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AndroidCodeGenTarget>XAJavaInterop1</AndroidCodeGenTarget>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -61,7 +62,7 @@
</ItemGroup>
<ItemGroup>
<InputJar Include="..\..\..\externals\android\libraries\base\classes.jar">
<Link>classes.jar</Link>
<Link>Jars\classes.jar</Link>
</InputJar>
</ItemGroup>
<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions XPlat/GoogleVR/Android/source/Google.VR.Android/Common/Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AndroidCodeGenTarget>XAJavaInterop1</AndroidCodeGenTarget>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
16 changes: 13 additions & 3 deletions XPlat/GoogleVR/Android/source/Google.VR.Android/Common/Transforms/Metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,18 @@
<remove-node path="/api/package[@name='com.google.vr.ndk.base.proto.nano']/class[@name='GvrApiData.RenderTextureParamsListData']" />
<remove-node path="/api/package[@name='com.google.vr.ndk.base.proto.nano']/class[@name='GvrApiData.RenderTextureParamsListData.RenderTextureParamsData']" />
<remove-node path="/api/package[@name='com.google.vrtoolkit.cardboard.proto.nano']/class[@name='CardboardDevice.CardboardInternalParams']" />



<remove-node path="/api/package[@name='com.google.vr.ndk.base']/class[@name='Event']/method[@name='finalize' and count(parameter)=0]" />
<remove-node path="/api/package[@name='com.google.vr.ndk.base']/class[@name='Value']/method[@name='finalize' and count(parameter)=0]" />

<attr path="/api/package[@name='com.google.vr.vrcore.controller.api.nano']/interface[@name='Maintenance.MaintenanceEvent.OtaEvent.EventType']" name="managedName">OtaEventType</attr>
<attr path="/api/package[@name='com.google.vr.vrcore.controller.api.nano']/interface[@name='Maintenance.MaintenanceEvent.SetupEvent.EventType']" name="managedName">SetupEventType</attr>

<attr path="/api/package[@name='com.google.vr.vrcore.controller.api.nano']/interface[@name='Maintenance.MaintenanceRequest.FirmwareUpdate.Action']" name="managedName">FirmwareUpdateAction</attr>
<attr path="/api/package[@name='com.google.vr.vrcore.controller.api.nano']/interface[@name='Maintenance.MaintenanceRequest.Setup.Action']" name="managedName">SetupAction</attr>

<attr path="/api/package[@name='com.google.common.logging.nano']/interface[@name='Vr.VREvent.JumpInspector.MediaDetails.VideoCodec']" name="managedName">MediaDetailsVideoCodec</attr>
<attr path="/api/package[@name='com.google.common.logging.nano']/interface[@name='Vr.VREvent.EarthVr.ControllerState.Role']" name="managedName">StateRole</attr>
<attr path="/api/package[@name='com.google.vrtoolkit.cardboard.proto.nano']/class[@name='CardboardDevice.DeviceParams']/method[@name='mergeFrom' and count(parameter)=1 and parameter[1][@type='com.google.protobuf.nano.CodedInputByteBufferNano']]" name="managedReturn">Google.Protobuf.Nano.MessageNano</attr>
<attr path="/api/package[@name='com.google.vrtoolkit.cardboard.proto.nano']/class[@name='Phone.PhoneParams']/method[@name='mergeFrom' and count(parameter)=1 and parameter[1][@type='com.google.protobuf.nano.CodedInputByteBufferNano']]" name="managedReturn">Google.Protobuf.Nano.MessageNano</attr>
</metadata>
</metadata>
1 change: 1 addition & 0 deletions XPlat/GoogleVR/Android/source/Google.VR.Android/CommonWidget/CommonWidget.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AndroidCodeGenTarget>XAJavaInterop1</AndroidCodeGenTarget>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 1 addition & 0 deletions XPlat/GoogleVR/Android/source/Google.VR.Android/Controller/Controller.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AndroidCodeGenTarget>XAJavaInterop1</AndroidCodeGenTarget>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
6 changes: 3 additions & 3 deletions XPlat/GoogleVR/Android/source/Google.VR.Android/GvrConsts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
static class __GvrConsts
{
public const string Url = "https://github.com/googlevr/gvr-android-sdk/archive/0954a01934199b8536755f06688d98e3d2a958e4.zip";
public const string LongVersion = "0954a01934199b8536755f06688d98e3d2a958e4";
public const string Version = "0.8.0";
public const string Url = "https://github.com/googlevr/gvr-android-sdk/archive/25a0c20415bd3854b76f3e0e55f73d36cdc076fd.zip";
public const string LongVersion = "25a0c20415bd3854b76f3e0e55f73d36cdc076fd";
public const string Version = "1.180.0";
}
1 change: 1 addition & 0 deletions XPlat/GoogleVR/Android/source/Google.VR.Android/PanoWidget/PanoWidget.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AndroidCodeGenTarget>XAJavaInterop1</AndroidCodeGenTarget>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
1 change: 1 addition & 0 deletions XPlat/GoogleVR/Android/source/Google.VR.Android/VideoWidget/VideoWidget.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AndroidCodeGenTarget>XAJavaInterop1</AndroidCodeGenTarget>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down
4 changes: 2 additions & 2 deletions XPlat/GoogleVR/iOS/build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

var TARGET = Argument ("t", Argument ("target", "Default"));

var IOS_VERSION = "0.8.0";
var IOS_NUGET_VERSION = "0.8.0-beta1";
var IOS_VERSION = "1.170.0";
var IOS_NUGET_VERSION = "1.170.0";
var IOS_PODS = new List<string> {
"platform :ios, '8.0'",
"install! 'cocoapods', :integrate_targets => false",
Expand Down