diff --git a/odrefresh/Android.bp b/odrefresh/Android.bp
index 530a714..85cd397 100644
--- a/odrefresh/Android.bp
+++ b/odrefresh/Android.bp
@@ -24,13 +24,32 @@ package {
     default_team: "trendy_team_art_mainline",
 }
 
+cc_library_static {
+    name: "libodrefresh_fs_utils",
+    defaults: ["art_defaults"],
+    srcs: ["odr_fs_utils.cc"],
+    local_include_dirs: ["include"],
+    header_libs: [
+        "dexoptanalyzer_headers",
+        "libart_headers",
+    ],
+    shared_libs: ["libbase"],
+    apex_available: [
+        "com.android.art",
+        "com.android.art.debug",
+        "test_broken_com.android.art",
+    ],
+    visibility: [
+        "//art:__subpackages__",
+    ],
+}
+
 cc_defaults {
     name: "odrefresh-defaults",
     srcs: [
         "odrefresh.cc",
         "odr_common.cc",
         "odr_compilation_log.cc",
-        "odr_fs_utils.cc",
         "odr_metrics.cc",
     ],
     local_include_dirs: ["include"],
@@ -43,6 +62,7 @@ cc_defaults {
     ],
     static_libs: [
         "libmodules-utils-build",
+        "libodrefresh_fs_utils",
     ],
     tidy: true,
     tidy_flags: [