Merge mozilla-central to autoland

dom/gamepad/moz.build

@@ -4,14 +4,6 @@
 # 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/.
 
-
-IPDL_SOURCES += [
-    'ipc/GamepadEventTypes.ipdlh',
-    'ipc/PGamepadEventChannel.ipdl',
-    'ipc/PGamepadTestChannel.ipdl'
-]
-
-if CONFIG['MOZ_GAMEPAD']:
 EXPORTS.mozilla.dom += [
     'Gamepad.h',
     'GamepadButton.h',
@@ -63,6 +55,12 @@ if CONFIG['MOZ_GAMEPAD']:
     'ipc',
 ]
 
+IPDL_SOURCES += [
+    'ipc/GamepadEventTypes.ipdlh',
+    'ipc/PGamepadEventChannel.ipdl',
+    'ipc/PGamepadTestChannel.ipdl'
+]
+
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

dom/moz.build

@@ -61,7 +61,6 @@ DIRS += [
     'filesystem',
     'flyweb',
     'fmradio',
-    'gamepad',
     'geolocation',
     'html',
     'icc',
@@ -136,6 +135,9 @@ if CONFIG['MOZ_B2G_RIL']:
 if CONFIG['MOZ_PAY']:
     DIRS += ['payment']
 
+if CONFIG['MOZ_GAMEPAD']:
+    DIRS += ['gamepad']
+
 if CONFIG['MOZ_NFC']:
     DIRS += ['nfc']