diff --git a/modules/radio/Android.bp b/modules/radio/Android.bp
index 7240869f..3d9ddef1 100644
--- a/modules/radio/Android.bp
+++ b/modules/radio/Android.bp
@@ -43,6 +43,7 @@ cc_library_shared {
 // Stub radio tool that can be run in native.
 cc_binary {
     name: "radio_hal_tool",
+    vendor: true,
     srcs: ["radio_hal_tool.c"],
     cflags: [
         "-Wall",
diff --git a/tests/hardware/Android.bp b/tests/hardware/Android.bp
index b1376840..a52a4ab1 100644
--- a/tests/hardware/Android.bp
+++ b/tests/hardware/Android.bp
@@ -21,5 +21,7 @@ cc_library_static {
         "-Werror",
     ],
 
+    vendor: true,
+
     include_dirs: ["system/media/camera/include"],
 }