Purge all specific debug changes and update bluez commit
Change-Id: Ifc81263da0f532a6f597d9802380b78667e1f35e
Reviewed-on: https://chromium-review.googlesource.com/c/1357100
Reviewed-by: Yunhan Wang <yunhanw@google.com>
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Commit-Queue: Yunhan Wang <yunhanw@google.com>
Tested-by: Yunhan Wang <yunhanw@google.com>
Trybot-Ready: Yunhan Wang <yunhanw@google.com>
diff --git a/net-wireless/bluez/bluez-5.44-r154.ebuild b/net-wireless/bluez/bluez-5.44-r154.ebuild
index 2f6720d..34bcfe2 100644
--- a/net-wireless/bluez/bluez-5.44-r154.ebuild
+++ b/net-wireless/bluez/bluez-5.44-r154.ebuild
@@ -3,7 +3,7 @@
# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.99.ebuild,v 1.7 2012/04/15 16:53:41 maekke Exp $
EAPI="5"
-CROS_WORKON_COMMIT="055e0fcf314ed491842cc03dc95a65b9f2986197"
+CROS_WORKON_COMMIT="83985c9fddbb9004f9867ec19cc66eaba42ee9ae"
CROS_WORKON_TREE="b47475d0735af26a254d7a996ad270f2012f34cd"
PYTHON_DEPEND="test-programs? 2"
CROS_WORKON_PROJECT="chromiumos/third_party/bluez"
@@ -83,7 +83,6 @@
--disable-obex \
--enable-sixaxis \
--disable-network \
- --enable-experimental \
$(use_enable bt_deprecated_tools deprecated)
}
diff --git a/net-wireless/bluez/files/start_bluetoothd.sh b/net-wireless/bluez/files/start_bluetoothd.sh
index 2a83eca..7d9d4b4 100644
--- a/net-wireless/bluez/files/start_bluetoothd.sh
+++ b/net-wireless/bluez/files/start_bluetoothd.sh
@@ -29,5 +29,5 @@
fi
exec /sbin/minijail0 -u bluetooth -g bluetooth -G \
-c 3500 -n -- \
- /usr/libexec/bluetooth/bluetoothd ${BLUETOOTH_DAEMON_OPTION} --nodetach --experimental --debug --configfile=/etc/bluetooth/main_common.conf \
+ /usr/libexec/bluetooth/bluetoothd ${BLUETOOTH_DAEMON_OPTION} --nodetach \
${config_file_param}
