commit 0da7dfc71506d1f6bfa93f0c5fdb33df49dea0e7
author Martin Stjernholm <mast@google.com> Wed May 12 00:38:05 2021 +0100
committer Martin Stjernholm <mast@google.com> Thu May 13 09:16:20 2021 +0000
tree c63b1581135b30c3bc605b4466f7c3a1f2d034a4
parent dac82393785d1d2fddae6bf6d8364b55b001925a

Make some libdexfile tests inherit art_test_defaults.

To be able to do changes in art_test_defaults (and art_defaults) to
affect all native code in the ART module.

Test: art/tools/run-gtests.sh \
        apex/com.android.art/bin/art/x86_64/art_libdexfile_support_tests \
        apex/com.android.art/bin/art/x86_64/art_libdexfile_tests
Test: m test-art-host-gtest
Bug: 172480615
Change-Id: I8f3f456b6172c84776a21cb9f1c76a1df1aa99bb

libdexfile/Android.bp

diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index f1a4c54..1a3c7bd 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -330,7 +330,7 @@
 
 art_cc_test {
     name: "art_libdexfile_external_tests",
-    host_supported: true,
+    defaults: ["art_test_defaults"],
     test_suites: ["general-tests"],
     srcs: [
         "external/dex_file_ext_c_test.c",
@@ -432,9 +432,11 @@
 
 art_cc_test {
     name: "art_libdexfile_support_static_tests",
-    host_supported: true,
     test_suites: ["general-tests"],
-    defaults: ["libdexfile_support_static_defaults"],
+    defaults: [
+        "art_test_defaults",
+        "libdexfile_support_static_defaults",
+    ],
     srcs: [
         "external/dex_file_supp_test.cc",
     ],
@@ -464,7 +466,7 @@
 
 art_cc_test {
     name: "art_libdexfile_static_tests",
-    host_supported: true,
+    defaults: ["art_test_defaults"],
     test_suites: ["general-tests"],
     srcs: [
         "external/dex_file_supp_test.cc",