From 70e430408cf18089690fc15f969be48d2df89f1a Mon Sep 17 00:00:00 2001
From: Abhishek Pandit-Subedi <abhishekpandit@google.com>
Date: Thu, 10 Jun 2021 21:16:52 +0000
Subject: [PATCH] Disable building C++ tests for Linux
Due to the use of multiple build systems, link dependencies between C++
and Rust where C++ does the final linking will fail. Until we have full
Bazel build, we can't enable these tests again.
Bug: 190750167
Tag: #floss
Test: Build for Linux
Change-Id: Iadd7dafe9635f606c2289eb246e3e2eb4931e92c
---
BUILD.gn | 35 ++++++++++++++++++-----------------
build.py | 15 ++++++++-------
2 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/BUILD.gn b/BUILD.gn
index ca2855f4e6e..ecbfa075d90 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -23,9 +23,9 @@
group("all") {
deps = [ ":bluetooth" ]
- if (use.test) {
- deps += [ ":bluetooth_tests" ]
- }
+ #if (use.test) {
+ #deps += [ ":bluetooth_tests" ]
+ #}
}
# This pulls in main/BUILD.gn and all of its dependencies.
@@ -37,20 +37,21 @@ group("bluetooth") {
]
}
-if (use.test) {
- group("bluetooth_tests") {
- deps = [
- "//bt/btcore:net_test_btcore",
- "//bt/common:bluetooth_test_common",
- "//bt/profile/avrcp:net_test_avrcp",
- "//bt/service:bluetoothtbd_test",
- "//bt/stack:net_test_btm_iso",
- "//bt/types:net_test_types",
-
- #"//bt/packet:net_test_btpackets",
- ]
- }
-}
+# TODO(b/190750167) - Re-enable once we're fully Bazel build
+#if (use.test) {
+ #group("bluetooth_tests") {
+ #deps = [
+ #"//bt/btcore:net_test_btcore",
+ #"//bt/common:bluetooth_test_common",
+ #"//bt/profile/avrcp:net_test_avrcp",
+ #"//bt/service:bluetoothtbd_test",
+ #"//bt/stack:net_test_btm_iso",
+ #"//bt/types:net_test_types",
+
+ ##"//bt/packet:net_test_btpackets",
+ #]
+ #}
+#}
if (host_cpu == target_cpu && host_os == target_os) {
group("tools") {
diff --git a/build.py b/build.py
index 808c80891d5..fb209ef83ac 100755
--- a/build.py
+++ b/build.py
@@ -66,14 +66,15 @@ VALID_TARGETS = [
'all', # All targets except test and clean
]
+# TODO(b/190750167) - Host tests are disabled until we are full bazel build
HOST_TESTS = [
- 'bluetooth_test_common',
- 'bluetoothtbd_test',
- 'net_test_avrcp',
- 'net_test_btcore',
- 'net_test_types',
- 'net_test_btm_iso',
- 'net_test_btpackets',
+ # 'bluetooth_test_common',
+ # 'bluetoothtbd_test',
+ # 'net_test_avrcp',
+ # 'net_test_btcore',
+ # 'net_test_types',
+ # 'net_test_btm_iso',
+ # 'net_test_btpackets',
]
--
GitLab