From 1dc111804f9ea778bce6258ffd10fed80fb02d0c Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Tue, 16 Apr 2024 18:33:11 +0100
Subject: Repurpose libnativeloader_lazy tests as shallow tests for API
 coverage in CTS.

Most APIs are exercised extensively in any managed process, but use
this to cover the fringes.

This drops the mocks that used dynamic library symbol overrides
(android_create_namespace and android_link_namespaces) from the former
libnativeloader_lazy tests, because we cannot inject them in CTS tests.
However it turns out it works just fine to call into the real code in
the linker.

As a result libnativeloader_lazy_test no longer needs to be built with
exported symbols necessary to make the symbol override mocks to work.

Also strengthen the CreateClassLoaderNamespace test slightly by
verifying that it really did create a classloader namespace.

Also move libnativeloader_test and libnativeloader_lazy_test from
device-tests to general-tests, because they shouldn't have any device
dependencies.

Test: atest libnativeloader_test \
            art_libnativeloader_cts_test \
            libnativeloader_lazy_test
Bug: 335224367
Change-Id: Idd15d5a79f4f54c68304a4b758c7a46ba9b96c86
---
 libnativeloader/Android.bp | 59 +++++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 19 deletions(-)

(limited to 'libnativeloader/Android.bp')

diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 4e5cde5665..f7e5bf8c98 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -123,8 +123,8 @@ cc_library {
     shared_libs: ["liblog"],
 }
 
-cc_defaults {
-    name: "libnativeloader-test-defaults",
+art_cc_test {
+    name: "libnativeloader_test",
     defaults: [
         "art_module_source_build_defaults",
         // Cannot use art_standalone_gtest_defaults because it makes us link
@@ -148,24 +148,13 @@ cc_defaults {
     ],
     shared_libs: [
         "liblog", // libbase dependency
+        "libnativeloader",
     ],
     static_libs: [
         "libbase",
         "libgmock",
     ],
 
-    test_for: [
-        "com.android.art",
-        "com.android.art.debug",
-    ],
-    test_suites: ["device-tests"],
-}
-
-art_cc_test {
-    name: "libnativeloader_test",
-    defaults: [
-        "libnativeloader-test-defaults",
-    ],
     tidy_timeout_srcs: [
         "native_loader_test.cpp",
     ],
@@ -174,21 +163,53 @@ art_cc_test {
         "native_loader_api_test.c",
         "native_loader_test.cpp",
     ],
+
+    test_for: [
+        "com.android.art",
+        "com.android.art.debug",
+    ],
+    test_suites: [
+        "general-tests",
+        "mts-art",
+    ],
+}
+
+cc_defaults {
+    name: "libnativeloader_api_test_defaults",
+    defaults: ["art_standalone_test_defaults"],
+
+    srcs: ["native_loader_api_test.cpp"],
+    header_libs: [
+        "libnativebridge-headers",
+        "libnativehelper_header_only",
+    ],
+    static_libs: [
+        "libbase",
+        "libgmock",
+    ],
+}
+
+art_cc_test {
+    name: "art_libnativeloader_cts_test",
+    defaults: ["libnativeloader_api_test_defaults"],
     shared_libs: [
         "libnativeloader",
     ],
+    test_config_template: ":art-gtests-target-standalone-cts-template",
     test_suites: [
-        "mts-art",
+        "cts",
+        "mcts-art",
     ],
 }
 
 art_cc_test {
     name: "libnativeloader_lazy_test",
-    defaults: ["libnativeloader-test-defaults"],
-    srcs: [
-        "native_loader_lazy_test.cpp",
-    ],
+    defaults: ["libnativeloader_api_test_defaults"],
     static_libs: [
         "libnativeloader_lazy",
     ],
+    test_suites: [
+        "general-tests",
+        "mts-art",
+    ],
 }
-- 
cgit v1.2.3-59-g8ed1b