Bug 1562497 - Build PuppetSession on Tier3 as VRService depends on it. r=daoshengmu, a=RyanVM
authorJan Beich <jbeich@FreeBSD.org>
Thu, 04 Jul 2019 07:41:57 +0000
changeset 544502 88399471e55995bc768985ade0a507494d09115d
parent 544501 1bb8756f2af0a06ed91d111b004237f5089822d7
child 544503 0b6b434c5303fa3683d013562be0f727c35cc22f
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdaoshengmu, RyanVM
bugs1562497
milestone69.0
Bug 1562497 - Build PuppetSession on Tier3 as VRService depends on it. r=daoshengmu, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D36811
gfx/vr/service/moz.build
--- a/gfx/vr/service/moz.build
+++ b/gfx/vr/service/moz.build
@@ -12,16 +12,22 @@ if CONFIG['OS_TARGET'] == 'WINNT':
 
 # Build OSVR on all platforms except Android
 if CONFIG['OS_TARGET'] != 'Android':
     UNIFIED_SOURCES += [
         'OSVRSession.cpp',
         'VRService.cpp',
         'VRSession.cpp',
     ]
+    # PuppetSession includes MacIOSurface.h which includes Mac headers
+    # which define Size and Points types in the root namespace that
+    # often conflict with our own types.
+    SOURCES += [
+        'PuppetSession.cpp',
+    ]
     include('/ipc/chromium/chromium-config.mozbuild')
 
 # Build OpenVR on Windows, Linux, and macOS desktop targets
 if CONFIG['OS_TARGET'] in ('WINNT', 'Linux', 'Darwin'):
     DIRS += [
         'openvr',
     ]
     LOCAL_INCLUDES += [
@@ -29,12 +35,11 @@ if CONFIG['OS_TARGET'] in ('WINNT', 'Lin
         '/gfx/layers/d3d11'
     ]
 
     # OpenVRSession includes MacIOSurface.h which includes Mac headers
     # which define Size and Points types in the root namespace that
     # often conflict with our own types.
     SOURCES += [
         'OpenVRSession.cpp',
-        'PuppetSession.cpp',
     ]
 
 FINAL_LIBRARY = 'xul'