CHROMIUM: Pull btattach out of experimental

BUG=chrome-os-partner:52835
TEST=`emerge-kevin bluez`

Change-Id: I9c045ce50c9e058ca9365e8ba464787b99b28a04
Reviewed-on: https://chromium-review.googlesource.com/341515
Tested-by: Wei-Ning Huang <wnhuang@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
Tested-by: Miao-chen Chou <mcchou@chromium.org>
Commit-Queue: Wei-Ning Huang <wnhuang@chromium.org>
diff --git a/Makefile.tools b/Makefile.tools
index bf2f0db..8840361 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -155,7 +155,9 @@
 			tools/rfcomm tools/rctest tools/l2test tools/l2ping \
 			tools/sdptool tools/ciptool tools/bccmd \
 			tools/bluemoon tools/hex2hcd tools/mpris-proxy \
-			tools/btmgmt tools/btgatt-client tools/btgatt-server
+			tools/btmgmt tools/btgatt-client tools/btgatt-server \
+			tools/btattach
+
 
 tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
 						tools/hciattach_st.c \
@@ -239,6 +241,9 @@
 tools_mpris_proxy_SOURCES = tools/mpris-proxy.c
 tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
 
+tools_btattach_SOURCES = tools/btattach.c monitor/bt.h
+tools_btattach_LDADD = src/libshared-mainloop.la
+
 dist_man_MANS += tools/hciattach.1 tools/hciconfig.1 \
 			tools/hcitool.1 tools/hcidump.1 \
 			tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
@@ -263,8 +268,6 @@
 endif
 
 if EXPERIMENTAL
-bin_PROGRAMS += tools/btattach
-
 noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest \
 			tools/scotest tools/amptest tools/hwdb \
 			tools/hcieventmask tools/hcisecfilter \
@@ -295,9 +298,6 @@
 tools_btinfo_SOURCES = tools/btinfo.c monitor/bt.h
 tools_btinfo_LDADD = src/libshared-mainloop.la
 
-tools_btattach_SOURCES = tools/btattach.c monitor/bt.h
-tools_btattach_LDADD = src/libshared-mainloop.la
-
 tools_btsnoop_SOURCES = tools/btsnoop.c
 tools_btsnoop_LDADD = src/libshared-mainloop.la