Bug 1283135 - Fix gamepad IPDL dependency with no gamepad r=baku
☠☠ backed out by 82e1f1b9c055 ☠ ☠
authorAlexandre Lissy <lissyx@lissyx.dyndns.org>
Wed, 29 Jun 2016 17:02:21 +0200
changeset 303202 bcd10b16cb335edf3dcb653b2e3db91176ecd8e0
parent 303201 1dc9bc2129e8fdb953cfdf4fd5d38aa4fff554ac
child 303203 1a1d7ef3cb0e6076f98088b57ebf7c2946e4c52f
push id79015
push usercbook@mozilla.com
push dateThu, 30 Jun 2016 10:51:07 +0000
treeherdermozilla-inbound@280e4ef4d764 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbaku
bugs1283135
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1283135 - Fix gamepad IPDL dependency with no gamepad r=baku MozReview-Commit-ID: LoUZCMPe2pC
dom/gamepad/moz.build
dom/moz.build
--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -1,74 +1,76 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-EXPORTS.mozilla.dom += [
-    'Gamepad.h',
-    'GamepadButton.h',
-    'GamepadManager.h',
-    'GamepadMonitoring.h',
-    'GamepadPlatformService.h',
-    'GamepadServiceTest.h',
-    'ipc/GamepadEventChannelChild.h',
-    'ipc/GamepadEventChannelParent.h',
-    'ipc/GamepadTestChannelChild.h',
-    'ipc/GamepadTestChannelParent.h'
-    ]
-
-UNIFIED_SOURCES = [
-    'Gamepad.cpp',
-    'GamepadButton.cpp',
-    'GamepadManager.cpp',
-    'GamepadMonitoring.cpp',
-    'GamepadPlatformService.cpp',
-    'GamepadServiceTest.cpp',
-    'ipc/GamepadEventChannelChild.cpp',
-    'ipc/GamepadEventChannelParent.cpp',
-    'ipc/GamepadTestChannelChild.cpp',
-    'ipc/GamepadTestChannelParent.cpp'
-    ]
-
-if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
-    UNIFIED_SOURCES += [
-        'fallback/FallbackGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
-    UNIFIED_SOURCES += [
-        'cocoa/CocoaGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
-    UNIFIED_SOURCES += [
-        'windows/WindowsGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
-    UNIFIED_SOURCES += [
-        'linux/LinuxGamepad.cpp'
-    ]
-elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android':
-    UNIFIED_SOURCES += [
-        'android/AndroidGamepad.cpp'
-    ]
-
-LOCAL_INCLUDES += [
-    'ipc',
-]
 
 IPDL_SOURCES += [
     'ipc/GamepadEventTypes.ipdlh',
     'ipc/PGamepadEventChannel.ipdl',
     'ipc/PGamepadTestChannel.ipdl'
 ]
 
-include('/ipc/chromium/chromium-config.mozbuild')
+if CONFIG['MOZ_GAMEPAD']:
+  EXPORTS.mozilla.dom += [
+      'Gamepad.h',
+      'GamepadButton.h',
+      'GamepadManager.h',
+      'GamepadMonitoring.h',
+      'GamepadPlatformService.h',
+      'GamepadServiceTest.h',
+      'ipc/GamepadEventChannelChild.h',
+      'ipc/GamepadEventChannelParent.h',
+      'ipc/GamepadTestChannelChild.h',
+      'ipc/GamepadTestChannelParent.h'
+      ]
+
+  UNIFIED_SOURCES = [
+      'Gamepad.cpp',
+      'GamepadButton.cpp',
+      'GamepadManager.cpp',
+      'GamepadMonitoring.cpp',
+      'GamepadPlatformService.cpp',
+      'GamepadServiceTest.cpp',
+      'ipc/GamepadEventChannelChild.cpp',
+      'ipc/GamepadEventChannelParent.cpp',
+      'ipc/GamepadTestChannelChild.cpp',
+      'ipc/GamepadTestChannelParent.cpp'
+      ]
 
-FINAL_LIBRARY = 'xul'
-LOCAL_INCLUDES += [
-    '/dom/base',
-]
+  if CONFIG['MOZ_GAMEPAD_BACKEND'] == 'stub':
+      UNIFIED_SOURCES += [
+          'fallback/FallbackGamepad.cpp'
+      ]
+  elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'cocoa':
+      UNIFIED_SOURCES += [
+          'cocoa/CocoaGamepad.cpp'
+      ]
+  elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'windows':
+      UNIFIED_SOURCES += [
+          'windows/WindowsGamepad.cpp'
+      ]
+  elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'linux':
+      UNIFIED_SOURCES += [
+          'linux/LinuxGamepad.cpp'
+      ]
+  elif CONFIG['MOZ_GAMEPAD_BACKEND'] == 'android':
+      UNIFIED_SOURCES += [
+          'android/AndroidGamepad.cpp'
+      ]
 
-CFLAGS += CONFIG['GLIB_CFLAGS']
-CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
-CXXFLAGS += CONFIG['GLIB_CFLAGS']
-CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+  LOCAL_INCLUDES += [
+      'ipc',
+  ]
+
+  include('/ipc/chromium/chromium-config.mozbuild')
+
+  FINAL_LIBRARY = 'xul'
+  LOCAL_INCLUDES += [
+      '/dom/base',
+  ]
+
+  CFLAGS += CONFIG['GLIB_CFLAGS']
+  CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+  CXXFLAGS += CONFIG['GLIB_CFLAGS']
+  CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -56,16 +56,17 @@ DIRS += [
     'devicestorage',
     'encoding',
     'events',
     'fetch',
     'filehandle',
     'filesystem',
     'flyweb',
     'fmradio',
+    'gamepad',
     'geolocation',
     'html',
     'icc',
     'inputport',
     'json',
     'jsurl',
     'asmjscache',
     'mathml',
@@ -130,19 +131,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
 if CONFIG['MOZ_B2G_RIL']:
     DIRS += [
         'wappush',
     ]
 
 if CONFIG['MOZ_PAY']:
     DIRS += ['payment']
 
-if CONFIG['MOZ_GAMEPAD']:
-    DIRS += ['gamepad']
-
 if CONFIG['MOZ_NFC']:
     DIRS += ['nfc']
 
 if CONFIG['MOZ_SIMPLEPUSH']:
     DIRS += ['simplepush']
 else:
     DIRS += ['push']