1 files changed, 18 insertions, 17 deletions
diff --git a/libnativeloader/Android.bp b/libnativeloader/Android.bp
index 2cc6b80787..316c087453 100644
--- a/libnativeloader/Android.bp
+++ b/libnativeloader/Android.bp
@@ -12,6 +12,9 @@ package {
 cc_defaults {
     name: "libnativeloader-defaults",
     defaults: ["art_defaults"],
+    cppflags: [
+        "-fvisibility=hidden",
+    ],
     header_libs: ["libnativeloader-headers"],
     export_header_lib_headers: ["libnativeloader-headers"],
 }
@@ -118,32 +121,30 @@ cc_library_headers {
 
 art_cc_test {
     name: "libnativeloader_test",
-    defaults: ["art_test_defaults"],
-    host_supported: false,
-
     srcs: [
         "native_loader_test.cpp",
+        "native_loader.cpp",
+        "library_namespaces.cpp",
+        "native_loader_namespace.cpp",
+        "public_libraries.cpp",
     ],
     cflags: ["-DANDROID"],
-
-    // The test mocks libdl_android and libnativebridge symbols, so export them
-    // to override the ones loaded from their libs.
-    ldflags: [
-        "-Wl,--export-dynamic-symbol=android_*",
-        "-Wl,--export-dynamic-symbol=NativeBridge*",
+    static_libs: [
+        "libbase",
+        "liblog",
+        "libgmock",
+        "PlatformProperties",
     ],
-
     header_libs: [
         "libnativebridge-headers",
         "libnativehelper_header_only",
+        "libnativeloader-headers",
     ],
-    static_libs: [
-        "libgmock",
-    ],
-    shared_libs: [
-        "libbase",
-        "libnativeloader",
+    // native_loader_test.cpp mocks libdl APIs so system_shared_libs
+    // are used to include C libraries without libdl.
+    system_shared_libs: [
+        "libc",
+        "libm",
     ],
-
     test_suites: ["device-tests"],
 }