Merge "Disable tests that require stubgraph for riscv" into main
diff --git a/automotive/vehicle/aidl/impl/fake_impl/hardware/Android.bp b/automotive/vehicle/aidl/impl/fake_impl/hardware/Android.bp
index 6030e15..448ec4a 100644
--- a/automotive/vehicle/aidl/impl/fake_impl/hardware/Android.bp
+++ b/automotive/vehicle/aidl/impl/fake_impl/hardware/Android.bp
@@ -38,6 +38,11 @@
         "wakeup_client_protos",
     ],
     host_supported: true,
+    arch: {
+        riscv64: {
+            enabled: false,
+        },
+    },
 }
 
 cc_defaults {
diff --git a/automotive/vehicle/aidl/impl/grpc/test/Android.bp b/automotive/vehicle/aidl/impl/grpc/test/Android.bp
index b3c6089..337e7af 100644
--- a/automotive/vehicle/aidl/impl/grpc/test/Android.bp
+++ b/automotive/vehicle/aidl/impl/grpc/test/Android.bp
@@ -72,4 +72,9 @@
         "-Wno-unused-parameter",
     ],
     test_suites: ["device-tests"],
+    arch: {
+        riscv64: {
+            enabled: false,
+        },
+    },
 }