diff --git a/patch/all/gecko/0002-Apply-fixes-in-BT-to-compile-with-M.patch b/patch/all/gecko/0002-Apply-fixes-in-BT-to-compile-with-M.patch deleted file mode 100644 index 3db1cca2e3b3c458424a42acc61593e1820a9b48..0000000000000000000000000000000000000000 --- a/patch/all/gecko/0002-Apply-fixes-in-BT-to-compile-with-M.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 07f6e652ac77b8f4d338bbe179d3221d432d5a9e Mon Sep 17 00:00:00 2001 -From: Carol Yang <cyang@codeaurora.org> -Date: Mon, 9 May 2016 10:26:04 -0700 -Subject: [PATCH] Apply fixes in BT to compile with M - -Change-Id: I8c99bbccc44fdf6649575d56492da4052c9fc6b4 ---- - configure.in | 5 +++++ - dom/bluetooth/moz.build | 2 ++ - 2 files changed, 7 insertions(+) - -diff --git a/configure.in b/configure.in -index 9cd79af..5902303 100644 ---- a/configure.in -+++ b/configure.in -@@ -340,6 +340,10 @@ if test -n "$gonkdir" ; then - H5OS_MIDI=1 - LIBS="$LIBS -lc++" - android_cxx_stl=libc++ -+ MOZ_ARG_ENABLE_BOOL(bluetooth-bdroid-use-caf-extensions, -+ [ --enable-bluetooth-bdroid-use-caf-extensions Enable bluedroid uses caf headers], -+ BLUETOOTH_BDROID_USE_CAF_EXTENSIONS=1, -+ BLUETOOTH_BDROID_USE_CAF_EXTENSIONS= ) - ;; - *) - AC_MSG_ERROR([Unsupported platform version: $ANDROID_VERSION]) -@@ -7667,6 +7671,7 @@ AC_SUBST(MOZ_B2G_BT) - AC_SUBST(MOZ_B2G_BT_BLUEZ) - AC_SUBST(MOZ_B2G_BT_BLUEDROID) - AC_SUBST(MOZ_B2G_BT_DAEMON) -+AC_SUBST(BLUETOOTH_BDROID_USE_CAF_EXTENSIONS) - - dnl ======================================================== - dnl = Enable building H5OS proprietary folder - H5OS (Gonk usually) -diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build -index ccb2563..0543bdd 100644 ---- a/dom/bluetooth/moz.build -+++ b/dom/bluetooth/moz.build -@@ -95,6 +95,8 @@ if CONFIG['MOZ_B2G_BT']: - DEFINES['MOZ_B2G_BT_BLUEDROID'] = True - if CONFIG['MOZ_B2G_BT_DAEMON']: - DEFINES['MOZ_B2G_BT_DAEMON'] = True -+ if CONFIG['BLUETOOTH_BDROID_USE_CAF_EXTENSIONS']: -+ DEFINES['Q_BLUETOOTH'] = True - elif CONFIG['MOZ_ENABLE_DBUS']: - CFLAGS += CONFIG['MOZ_DBUS_CFLAGS'] - CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS'] --- -1.8.2.1 -