Backed out changeset bcd10b16cb33 (bug 1283135) on developers request
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 30 Jun 2016 13:49:58 +0200
changeset 382798 82e1f1b9c0559f38a8460e2f2f3044de4c7712d6
parent 382794 bcf4ff0c3eef498cd853a88270c75c161e524549
child 382799 ed0e4bd914805f73b42ebd524da47e8cb434777b
child 382800 36e12f17f73e9f7a09c189c039c9d64df0d8da4e
child 382801 e54020a658899a11df5475950e024bc354368dea
child 382811 30895175b2b52776c7ad9ced20e48ea1db7cf1c2
child 382820 98e3c7c9cf73d72a91517b63ed01d716e9961123
child 382832 fc5ec3f3844514a328972c97e58dd6d0898c5ab6
child 382840 2bbefb3a45ea055f05c67a27f620b05996302bfb
child 382847 09d9110ad3fdffabe9e54eed13ef827893e568f4
child 382848 d87985756d451a365775389f057333b54e8c2ae2
child 382849 5b0238c8cdb3ca16e82fc0152c13c9efd72b7996
child 382850 27421a091b2b5ba6501c4b8c8d4128e34a5c97d7
child 382858 163c5781159a3f4689c9f15171a81baa190787c8
child 382859 d4994dcea228446a3e4118069182af8651a2116a
child 382872 0e7b5eb81cf68ec52b459c2049db90709937d554
child 382873 281e7ddcb23da8e62873e8e77848e9324fb82647
child 382874 a6e7ebe13fc36e4b4a479c3ed3c06bc00705c988
child 382875 74aed8febecdcdb68cee7a395fb95cffff89d03c
child 382878 afffeeb5715e15027515e1a12bf0f9ccbc870a01
child 382881 d41ee1432ba459c99df71c71af099d4ffb244728
child 382883 92b9585597e74624e327333fef8dc22f1f210a0a
child 382884 04319d1ee01f534d13c3fa2b5eaaa0934e203cf0
child 382885 7c3047542f0ebee5e67921d7c21c93220c8c574e
child 382887 bc26841977b6d04a74ace7aa85aca317a3bf498b
child 382901 7940be96e124a4f6b812d2b3ad6762f2921be04b
child 382918 1351c915bad3c3087cab04238c44c4adaa8c809f
child 382920 4086033ad6bf335d66f62c7d42a64f8c2e0c73d6
child 382923 b211130e94f1aa7708127b9c8daff839817a534b
child 382925 e69e462f94b121f8e7640b436c598f6ad3daee5a
child 382926 645ea1d7bc9076928836f190dc7c7b774b059b7d
child 382953 c79bb5575f32ca5e85c0b6a044c7eeb2d4a25859
child 382956 88e811adcde0506d4bbd7d223d308bdaba7647c2
child 382964 db4cee8cb6904ee00393ca3e5de6980baa1daecf
child 382965 25a29ef79e9168ead07c3720d5fb2f3e052ad7a9
child 382966 b47bc11bfe70f20007e384759c49e7528375a00b
child 382971 45fcc00972f17dc0369b430b612b7e5054124c93
child 383015 b5eb0aadd20592b98dc0335a8745b4ead3cfe6d5
child 383020 4c7fa0c36d9f1bf4fe1a91cef56a24e00dd3606d
child 383021 6080e6bfd341d574919d5f8d393e23931c267577
child 383025 07ae10c2327e6614dcfe14e2e9f93e080cb51228
child 383029 7b2df6c570ec8b815fef39791849b71f2efcf088
child 383033 d2a4891fbef64f60d4ac940cbbbbcd6d952a5ebf
child 383034 ffa1bfaf23398aee04d8d46848f4576893c5dd95
child 383067 46d731ddf201b5c5a168f8fcc6ac0390acb0d4f0
child 383099 68dfcbc7ff2052e1926d2dff855c1133ea274f38
child 383105 cf432462c2ea3379a5c46a0bf4d5140aaa0e38bc
child 383106 c4f15e1497aa6abab2caf5a868832df9844efba7
child 383109 f9088649498706b7f1580709b65d4343b0b289be
child 383110 1b73ac416350f65106bbc4e2cae7ce92b5e4f163
child 383119 6bf259d65c232546a971881af60a8e32a5dc986b
child 383141 61ed5c0d64195c58de57489147046aeaf14252d3
child 383159 d6fba57e358b3bc571134ad96a6a20b80a8bef4e
child 383161 fb0c93c4dd1c7f8d841df1b005094edf678ed231
child 383166 f5aed1335f4d293c24385485a1ffa58a27cd4a10
child 383168 4cc0db0a7ed7725bf8cc4064aecfe65db87b1e8a
child 383172 058b88b33eba720fd78440a563d7d4dd22c8d995
child 383249 4ec6d3ec798b1c85a4e3be5d84e787ce5fe0ce35
child 383258 39c057aa6045d2a81b3bd0755634b4af37738b21
child 383271 a2d473a3dc4be17fa102c056b7ff2899b51d9a0f
child 383299 34ab41901d409008e042d8328878176a56cdfbad
child 383331 b796d12ae0a87533df30372ee6da232fdefaff80
child 383420 4f7a95b9368abecf7a58f8dbe7e623dbbfea9e5a
child 383454 fc51c61df8076b1eed1038c2cfb15fd93febbb80
child 383494 90a2d565a84c624a4287e52fef2e9255df53cdfc
child 383498 1fa17ecf6274a4dfcf156f4d16477c95279d80c7
child 383500 1fee11cca4b84b3601f1adcfefa8328373060dbb
child 383510 3f674d8f1902a0680d7e5cfc8d4352836c1e59f0
child 383851 85c85a6a50baf8f4b73bb884300a4d8edab05425
child 384596 980fe2f0347ac6d6e202d7d12e026d897cb36ce0
child 384597 d6864f6081e144670034e3691ddafc37a7030a54
child 387769 aca1aa7c5dd536ec48bc86bba15c05732386e2db
push id21823
push userbmo:lissyx+mozillians@lissyx.dyndns.org
push dateThu, 30 Jun 2016 13:29:40 +0000
bugs1283135
milestone50.0a1
backs outbcd10b16cb335edf3dcb653b2e3db91176ecd8e0
Backed out changeset bcd10b16cb33 (bug 1283135) on developers request
dom/gamepad/moz.build
dom/moz.build
--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -1,76 +1,74 @@
 # -*- 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'
 ]
 
-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'
-      ]
+include('/ipc/chromium/chromium-config.mozbuild')
 
-  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'
-      ]
+FINAL_LIBRARY = 'xul'
+LOCAL_INCLUDES += [
+    '/dom/base',
+]
 
-  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']
+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,17 +56,16 @@ DIRS += [
     'devicestorage',
     'encoding',
     'events',
     'fetch',
     'filehandle',
     'filesystem',
     'flyweb',
     'fmradio',
-    'gamepad',
     'geolocation',
     'html',
     'icc',
     'inputport',
     'json',
     'jsurl',
     'asmjscache',
     'mathml',
@@ -131,16 +130,19 @@ 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']