add old conditionals for ENABLE_VR || UNITY_GAMECORE for InputDeviceCharacteristics

Author: jdiehlUnity

Packages/com.unity.inputsystem/InputSystem/Plugins/XR/GenericXRDevice.cs

@@ -112,7 +112,7 @@ public class XRController : TrackedDevice
         protected override void FinishSetup()
         {
             base.FinishSetup();
-#if UNITY_INPUT_SYSTEM_ENABLE_XR
+#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE)
             var capabilities = description.capabilities;
             var deviceDescriptor = XRDeviceDescriptor.FromJson(capabilities);
 

Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRLayoutBuilder.cs

@@ -88,7 +88,7 @@ internal static string OnFindLayoutForDevice(ref InputDeviceDescription descript
             {
                 return null;
             }
-#if UNITY_INPUT_SYSTEM_ENABLE_XR
+#if UNITY_INPUT_SYSTEM_ENABLE_XR && ENABLE_VR
             if (string.IsNullOrEmpty(matchedLayout))
             {
                 const InputDeviceCharacteristics controllerCharacteristics = InputDeviceCharacteristics.HeldInHand | InputDeviceCharacteristics.Controller;

Packages/com.unity.inputsystem/InputSystem/Plugins/XR/XRSupport.cs

@@ -102,7 +102,7 @@ public class XRDeviceDescriptor
         /// <summary>
         /// The capabilities of the device, used to help filter and identify devices that server a certain purpose (e.g. controller, or headset, or hardware tracker).
         /// </summary>
-#if UNITY_INPUT_SYSTEM_ENABLE_XR
+#if UNITY_INPUT_SYSTEM_ENABLE_XR && (ENABLE_VR || UNITY_GAMECORE)
         public InputDeviceCharacteristics characteristics;
 #else
         [SerializeField]