commit 48e4ce6872d2e4c2b0a508b2bd7d7111a1aa66a9
author Julien Desprez <jdesprez@google.com> Thu Jan 14 18:51:45 2021 -0800
committer Julien Desprez <jdesprez@google.com> Wed Jan 20 10:23:41 2021 -0800
tree 0156b21247464dd5c7fcc8c5e7b5be2602617835
parent 3ad403bba54a933bf81b0d816dfdbbf05765837f

Switch required to data to be bundled in host-unit-tests

Test: make fec_unittest
Bug: 177450457
Change-Id: I01d8cb0585e94703be97523117ef95581b75cbba

libfec/test/Android.bp

diff --git a/libfec/test/Android.bp b/libfec/test/Android.bp
index 75182a2..b3dca29 100644
--- a/libfec/test/Android.bp
+++ b/libfec/test/Android.bp
@@ -47,10 +47,13 @@
     srcs: ["fec_unittest.cpp"],
 
     gtest: true,
-    required: [
-        "avbtool",
-        "fec",
+    data: [
+        ":avbtool",
+        ":fec",
     ],
+    test_options: {
+        unit_test: true,
+    },
     static_libs: [
         "libverity_tree",
         "libfec",

verity/fec/Android.bp

diff --git a/verity/fec/Android.bp b/verity/fec/Android.bp
index 4bcecb0..68d44fd 100644
--- a/verity/fec/Android.bp
+++ b/verity/fec/Android.bp
@@ -1,6 +1,15 @@
 cc_binary_host {
     name: "fec",
 
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "",
+        },
+    },
     target: {
         linux_glibc: {
             sanitize: {