commit 7e69ba54455d98aa4957d45c57ff80380b8b8f03
author Andrew Walbran <qwandor@google.com> Wed May 10 14:47:49 2023 +0000
committer Andrew Walbran <qwandor@google.com> Fri Jun 02 12:31:29 2023 +0000
tree 3fae5327d727e5fe11a11d2374ada99a60225ace
parent 232b89c306272422696b10f4364c7919840cfe29

Use linkme rather than collecting tests manually.

Bug: 260692911
Test: atest apkdmverity.test libdm_rust.test
Change-Id: I9355dc13e31c4487109be31e2d7a7a50b16fb889

libs/ignorabletest/Android.bp

diff --git a/libs/ignorabletest/Android.bp b/libs/ignorabletest/Android.bp
index 0947243..10aef8e 100644
--- a/libs/ignorabletest/Android.bp
+++ b/libs/ignorabletest/Android.bp
@@ -8,6 +8,7 @@
     edition: "2021",
     rustlibs: [
         "liblibtest_mimic",
+        "liblinkme",
     ],
     proc_macros: ["libpaste"],
     apex_available: [
@@ -22,5 +23,12 @@
     cfgs: ["test"],
     rustlibs: [
         "libignorabletest",
+        "liblinkme",
+    ],
+    // Without this flag we get linker errors saying to add it. See
+    // https://github.com/dtolnay/linkme/issues/49 and related issues.
+    ld_flags: [
+        "-z",
+        "nostart-stop-gc",
     ],
 }