commit 994ac9e8b1ae41ed94acf8214cedbb4226704037
author Roland McGrath <mcgrathr@google.com> Sun Aug 02 01:24:24 2020 +0000
committer CQ Bot Account <commit-bot@chromium.org> Sun Aug 02 01:24:24 2020 +0000
tree 78a70eb85715a831fa60dbf725e649a9228e9a4a
parent 9bd7a787cdc4475c2989c41969813ff1de39021a

[zbitl] Include zbitl-unittests host in default bringup+tests build

Update the GN deps so that e.g. //bundles/buildbot:bringup always
leads to building the host version of the test.

Bug: 49438
Change-Id: I27035d505c88e31d872b69b6c5900c433acc3480
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/412741
Commit-Queue: Roland McGrath <mcgrathr@google.com>
Reviewed-by: Joshua Seaton <joshuaseaton@google.com>

bundles/bringup/BUILD.gn

diff --git a/bundles/bringup/BUILD.gn b/bundles/bringup/BUILD.gn
index 436dd67..6a491ad 100644
--- a/bundles/bringup/BUILD.gn
+++ b/bundles/bringup/BUILD.gn
@@ -95,7 +95,7 @@
     "//zircon/system/ulib/trace-vthread/test:trace-vthread-test-package",
     "//zircon/system/ulib/trace-vthread/test:trace-vthread-with-static-engine-test-package",
     "//zircon/system/ulib/utf_conversion/test:utf-conversion-package",
-    "//zircon/system/ulib/zbitl/test:zbitl-test-package",
+    "//zircon/system/ulib/zbitl/test",
     "//zircon/system/ulib/zircon-crypto/test:zircon-crypto-package",
     "//zircon/system/ulib/zx-panic-libc/test:zx-panic-libc-test-package",
     "//zircon/system/ulib/zx/test:zx-package",

zircon/system/ulib/zbitl/test/BUILD.gn

diff --git a/zircon/system/ulib/zbitl/test/BUILD.gn b/zircon/system/ulib/zbitl/test/BUILD.gn
index 0625e16..50739dd5 100644
--- a/zircon/system/ulib/zbitl/test/BUILD.gn
+++ b/zircon/system/ulib/zbitl/test/BUILD.gn
@@ -19,7 +19,7 @@
   testonly = true
   deps = [
     ":zbitl-test-package",
-    ":zbitl-unittests",
+    ":zbitl-unittests($host_toolchain)",
   ]
 }