commit fcd3d855516055df3002cfacf53025803c86e25c
author Nicolas Geoffray <ngeoffray@google.com> Fri Mar 19 17:57:12 2021 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Mar 23 08:24:42 2021 +0000
tree 49b98a39d231d9eccfcfd23dab418796b7f5a429
parent 1043aa2489538fe7089ba3cc8fac0567672b14d6

Move libsigchain into whole_static_libs for dalvikvm on host.

This seems to resolve the asan failures.

Test: TARGET_PRODUCT=armv8 TARGET_BUILD_VARIANT=eng ./art/test/testrunner/run_build_test_target.py -j40 art-asan
Bug: 183102427
Change-Id: I47ad9ef57e35eeb7f445062535fadeb558040f9c

dalvikvm/Android.bp

diff --git a/dalvikvm/Android.bp b/dalvikvm/Android.bp
index 7c83cd4..1b2ac9d 100644
--- a/dalvikvm/Android.bp
+++ b/dalvikvm/Android.bp
@@ -36,17 +36,22 @@
     ],
     shared_libs: [
         "libnativehelper",
-        "libsigchain",
     ],
     target: {
         android: {
             shared_libs: [
                 "liblog",
+                "libsigchain",
             ],
         },
         linux: {
             ldflags: ["-Wl,--export-dynamic"],
         },
+        host: {
+            // TODO(b/183102427): this seems to help asan on host, but libsgichain should
+            // really be in shared_libs.
+            whole_static_libs: ["libsigchain"],
+        },
         darwin: {
             enabled: false,
         },