author Thomas Zimmermann <>
Thu, 16 Apr 2015 10:48:21 +0200
changeset 269283 ed90daa452972ca497be139fb017d3ca5f3bb8a8
parent 269111 aa696047a7790f91ddf29bea9c8eb77f4388da52
child 269401 68368c996a67663f61f12ec0da6a39a802bd8013
child 269566 9f89398581660ba1151db78352523c079a98fa83
permissions -rw-r--r--
Bug 1154235: Share BluetoothUtils.{cpp,h} between Bluetooth v1 and v2, r=btian With this patch, Bluetooth v1 and v2 share the same files for BluetoothUtils.{cpp,h}. Some of the functions are still version specific and cannot be shared. The v1 variants can be removed after switching to v2.

# To trigger a clobber replace ALL of the textual description below,
# giving a bug number and a one line description of why a clobber is
# required. Modifying this file will make configure check that a
# clobber has been performed before the build can continue.
# MERGE NOTE: When merging two branches that require a CLOBBER, you should
#             merge both CLOBBER descriptions, to ensure that users on
#             both branches correctly see the clobber warning.
#                  O   <-- Users coming from both parents need to Clobber
#               /     \
#          O               O
#          |               |
#          O <-- Clobber   O  <-- Clobber
# Note: The description below will be part of the error message shown to users.
# Modifying this file will now automatically clobber the buildbot machines \o/

# Are you updating CLOBBER because you think it's needed for your WebIDL
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.

Bug 1154235: Merge BluetoothUtils.{cpp,h} variants into single file

This patch set renames and removes source files. This requires updating
the build system's dependency information from scratch. The issue has
been reported in bug 1154232.