1 files changed, 16 insertions, 3 deletions
diff --git a/artd/Android.bp b/artd/Android.bp
index 8b74981e2f..50f5428435 100644
--- a/artd/Android.bp
+++ b/artd/Android.bp
@@ -35,11 +35,8 @@ cc_defaults {
         "profman_headers",
     ],
     shared_libs: [
-        "libartservice",
-        "libarttools", // Contains "libc++fs".
         "libbase",
         "libbinder_ndk",
-        "libdexfile",
         "libselinux",
     ],
     static_libs: [
@@ -57,6 +54,9 @@ art_cc_binary {
     shared_libs: [
         "libart",
         "libartbase",
+        "libartservice",
+        "libarttools", // Contains "libc++fs".
+        "libdexfile",
     ],
     apex_available: [
         "com.android.art",
@@ -93,6 +93,11 @@ art_cc_test {
         "art_gtest_defaults",
         "art_artd_tests_defaults",
     ],
+    shared_libs: [
+        "libartservice",
+        "libarttools",
+        "libdexfile",
+    ],
 }
 
 // Standalone version of ART gtest `art_artd_tests`, not bundled with the ART
@@ -103,6 +108,11 @@ art_cc_test {
         "art_standalone_gtest_defaults",
         "art_artd_tests_defaults",
     ],
+    static_libs: [
+        "libartservice",
+        "libarttools",
+        "libdexfile",
+    ],
     test_config_template: "art_standalone_artd_tests.xml",
 }
 
@@ -124,6 +134,9 @@ cc_fuzz {
     shared_libs: [
         "libart",
         "libartbase",
+        "libartservice",
+        "libarttools",
+        "libdexfile",
         "liblog",
     ],
     fuzz_config: {