CHROMIUM: Disable AVCTP/AVRCP tests

These tests are currently failing and we don't really need them as we don't use
the features covered by these tests.

BUG=chromium:550768
TEST=Build BlueZ with FEATURES=test and verify that test-avrcp and test-avctp
don't run.

Change-Id: I91ac78f22c1789b2206aeb9d4c6d9fdff5313eeb
Reviewed-on: https://chromium-review.googlesource.com/311791
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Tested-by: Aviv Keshet <akeshet@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>
diff --git a/Makefile.am b/Makefile.am
index d74187a..ecaea4d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -333,21 +333,25 @@
 				android/avdtp.c android/avdtp.h
 unit_test_avdtp_LDADD = src/libshared-glib.la @GLIB_LIBS@
 
-unit_tests += unit/test-avctp
-
-unit_test_avctp_SOURCES = unit/test-avctp.c \
-				src/log.h src/log.c \
-				android/avctp.c android/avctp.h
-unit_test_avctp_LDADD = src/libshared-glib.la @GLIB_LIBS@
-
-unit_tests += unit/test-avrcp
-
-unit_test_avrcp_SOURCES = unit/test-avrcp.c \
-				src/log.h src/log.c \
-				android/avctp.c android/avctp.h \
-				android/avrcp-lib.c android/avrcp-lib.h
-unit_test_avrcp_LDADD = lib/libbluetooth-internal.la \
-				src/libshared-glib.la @GLIB_LIBS@
+# Disable the AVCTP/AVRCP tests. AVRCP and AVCTP tests. The source files in
+# question aren't relevant to Chrome OS and these tests are failing. (See
+# crbug.com/550768).
+#
+#unit_tests += unit/test-avctp
+#
+#unit_test_avctp_SOURCES = unit/test-avctp.c \
+#				src/log.h src/log.c \
+#				android/avctp.c android/avctp.h
+#unit_test_avctp_LDADD = src/libshared-glib.la @GLIB_LIBS@
+#
+#unit_tests += unit/test-avrcp
+#
+#unit_test_avrcp_SOURCES = unit/test-avrcp.c \
+#				src/log.h src/log.c \
+#				android/avctp.c android/avctp.h \
+#				android/avrcp-lib.c android/avrcp-lib.h
+#unit_test_avrcp_LDADD = lib/libbluetooth-internal.la \
+#				src/libshared-glib.la @GLIB_LIBS@
 
 unit_tests += unit/test-hfp