1 files changed, 35 insertions, 1 deletions
diff --git a/disassembler/Android.bp b/disassembler/Android.bp
index 4b55673bf0..b7f758ffdc 100644
--- a/disassembler/Android.bp
+++ b/disassembler/Android.bp
@@ -104,7 +104,6 @@ art_cc_library {
             ],
         },
     },
-
     apex_available: [
         "com.android.art",
         "com.android.art.debug",
@@ -132,3 +131,38 @@ cc_library_headers {
         "com.android.art",
     ],
 }
+
+art_cc_defaults {
+    name: "art_disassembler_tests_defaults",
+    codegen: {
+        arm64: {
+            srcs: ["disassembler_arm64_test.cc"],
+        },
+    },
+}
+
+// Version of ART gtest `art_disassembler_tests` bundled with the ART APEX on target.
+// TODO(b/192274705): Remove this module when the migration to standalone ART gtests is complete.
+art_cc_test {
+    name: "art_disassembler_tests",
+    defaults: [
+        "art_gtest_defaults",
+        "art_disassembler_tests_defaults",
+    ],
+    static_libs: [
+        "libvixld",
+    ],
+}
+
+// Standalone version of ART gtest `art_disassembler_tests`,
+// not bundled with the ART APEX on target.
+art_cc_test {
+    name: "art_standalone_disassembler_tests",
+    defaults: [
+        "art_standalone_gtest_defaults",
+        "art_disassembler_tests_defaults",
+    ],
+    static_libs: [
+        "libvixl",
+    ],
+}