1 files changed, 34 insertions, 43 deletions

diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index e9c26c592c..9d8fdb153c 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -9,6 +9,28 @@ package {
     default_applicable_licenses: ["art_license"],
 }
 
+cc_library_headers {
+    name: "libnativeloader-headers",
+    defaults: ["art_defaults"],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.art",
+        "com.android.art.debug",
+        "com.android.media",
+    ],
+    visibility: [
+        "//art:__subpackages__",
+        // TODO(b/133140750): Clean this up.
+        "//frameworks/av/media/libstagefright",
+        "//frameworks/native/libs/graphicsenv",
+        "//frameworks/native/vulkan/libvulkan",
+    ],
+    host_supported: true,
+    export_include_dirs: ["include"],
+    header_libs: ["jni_headers"],
+    export_header_lib_headers: ["jni_headers"],
+}
+
 cc_defaults {
     name: "libnativeloader-defaults",
     defaults: ["art_defaults"],
@@ -75,6 +97,9 @@ art_cc_library {
     },
 }
 
+// Wrapper that loads nativeloader.so lazily, to be used to deal with layer
+// inversion in places like in early boot where libnativeloader and/or
+// libnativebridge aren't available.
 // TODO(b/124250621) eliminate the need for this library
 cc_library {
     name: "libnativeloader_lazy",
@@ -95,33 +120,14 @@ cc_library {
     shared_libs: ["liblog"],
 }
 
-cc_library_headers {
-    name: "libnativeloader-headers",
-    defaults: ["art_defaults"],
-    apex_available: [
-        "//apex_available:platform",
-        "com.android.art",
-        "com.android.art.debug",
-        "com.android.media",
-    ],
-    visibility: [
-        "//art:__subpackages__",
-        // TODO(b/133140750): Clean this up.
-        "//frameworks/av/media/libstagefright",
-        "//frameworks/native/libs/graphicsenv",
-        "//frameworks/native/vulkan/libvulkan",
-    ],
-    host_supported: true,
-    export_include_dirs: ["include"],
-    header_libs: ["jni_headers"],
-    export_header_lib_headers: ["jni_headers"],
-}
-
 cc_defaults {
     name: "libnativeloader-test-defaults",
     defaults: [
         "art_module_source_build_defaults",
-        "art_test_defaults",
+        // Cannot use art_standalone_gtest_defaults because it makes us link
+        // libnativebridge statically through libart-gtest, but we need to mock
+        // its symbols here.
+        "art_standalone_test_defaults",
     ],
     host_supported: false,
 
@@ -145,13 +151,16 @@ cc_defaults {
         "libbase",
     ],
 
+    test_for: [
+        "com.android.art",
+        "com.android.art.debug",
+    ],
     test_suites: ["device-tests"],
 }
 
 art_cc_test {
     name: "libnativeloader_test",
     defaults: [
-        "art_standalone_test_defaults",
         "libnativeloader-test-defaults",
     ],
     tidy_timeout_srcs: [
@@ -161,30 +170,12 @@ art_cc_test {
         "library_namespaces_test.cpp",
         "native_loader_api_test.c",
         "native_loader_test.cpp",
-        "open_system_library.cpp",
-    ],
-    static_libs: [
-        "libbase",
-        "libnativeloader",
     ],
     shared_libs: [
-        "liblog",
+        "libnativeloader",
     ],
-    target: {
-        android: {
-            static_libs: [
-                "libPlatformProperties",
-            ],
-        },
-    },
-
-    // Added to CTS for API coverage of libnativeloader which is backed by the
-    // ART module.
-    test_config_template: ":art-gtests-target-standalone-cts-template",
     test_suites: [
-        "cts",
         "mts-art",
-        "mcts-art",
     ],
 }