Ensure ART gtests are both or neither in CTS and MCTS.

For now, there is no good reason to have ART gtests have a
different test suite membership w.r.t. CTS and MCTS.

This change adds the following test modules to ART MCTS:

* `art_standalone_libdexfile_external_tests`
* `odsign_e2e_tests`

Also update some comments about CTS and MCTS in Blueprint files.

Flag: TEST_ONLY
Test: Run `m mcts-art` and check the content of `android-mcts-art.zip`
Bug: 147819342
Change-Id: I6d2cb298006d1eb1a56d7c836becd2c6f3890649

5 files changed, 15 insertions, 9 deletions

diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 3e62abe006..72a60c1a3b 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -554,7 +554,7 @@ art_cc_test {
     test_config: "art_standalone_dex2oat_tests.xml",
 }
 
-// Counterpart to art_standalone_dex2oat_tests for tests that go into CTS.
+// Counterpart to art_standalone_dex2oat_tests for tests that go into CTS/MCTS.
 art_cc_test {
     name: "art_standalone_dex2oat_cts_tests",
     defaults: ["art_standalone_gtest_defaults"],
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 37f17308cd..68503276cb 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -411,7 +411,11 @@ art_cc_test {
     ],
 
     test_config_template: ":art-gtests-target-standalone-cts-template",
-    test_suites: ["cts"], // For backed-by API coverage.
+    // For backed-by API coverage.
+    test_suites: [
+        "cts",
+        "mcts-art",
+    ],
 }
 
 // Support library with a C++ API for accessing the libdexfile API for external
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp
index 3dbb79b730..9f6c84cbc4 100644
--- a/libnativebridge/tests/Android.bp
+++ b/libnativebridge/tests/Android.bp
@@ -178,8 +178,8 @@ cc_test {
     ],
 }
 
-// Very basic tests in CTS to verify backed-by API coverage of the exported API
-// in libnativebridge.map.txt.
+// Very basic tests in CTS/MCTS to verify backed-by API coverage of the exported
+// API in libnativebridge.map.txt.
 cc_test {
     name: "art_libnativebridge_cts_tests",
     defaults: ["art_standalone_test_defaults"],
diff --git a/test/Android.bp b/test/Android.bp
index 988dd3e5d7..ba34037800 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -141,7 +141,7 @@ filegroup {
 }
 
 // Test configuration template for standalone ART gtests on target (not bundled with the ART APEX)
-// which are part of CTS.
+// which are part of CTS and MCTS.
 filegroup {
     name: "art-gtests-target-standalone-cts-template",
     srcs: ["art-gtests-target-standalone-cts-template.xml"],
@@ -217,9 +217,10 @@ art_cc_defaults {
 
     // Support multilib variants (using different suffix per sub-architecture),
     // which is needed on build targets with secondary architectures, as the
-    // CTS/MTS/etc test suite packaging logic flattens all test artifacts into a
-    // single `testcases` directory. Also, there is CI testing that expects
-    // 64-bit multilib test suites to work for 32-bit devices (b/233550842).
+    // CTS/MCTS/MTS/etc. test suite packaging logic may flatten all test artifacts
+    // into a single `testcases` directory. Also, there is CI testing that
+    // expects 64-bit multilib test suites to work for 32-bit devices
+    // (b/233550842).
     compile_multilib: "both",
     multilib: {
         lib32: {
@@ -490,7 +491,7 @@ filegroup {
 }
 
 // Same as `art-run-test-target-template`, but contains additional
-// options to also make the test part of ART CTS.
+// options to also make the test part of CTS and MCTS.
 filegroup {
     name: "art-run-test-target-cts-template",
     srcs: [
diff --git a/test/odsign/Android.bp b/test/odsign/Android.bp
index ca1da53323..5aa0f4d25a 100644
--- a/test/odsign/Android.bp
+++ b/test/odsign/Android.bp
@@ -39,6 +39,7 @@ java_test_host {
     test_suites: [
         "general-tests",
         "cts",
+        "mcts-art",
     ],
 }