diff --git a/Android.bp b/Android.bp
index 2ee1616..ad750d0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -128,14 +128,13 @@
     name: "checkvintf",
     defaults: ["libvintf-defaults"],
     static_libs: [
+        "libbase",
         "libhidl-gen-utils",
         "libvintf_common",
         "libutils",
         "libtinyxml2",
     ],
-    shared_libs: [
-        "libbase",
-    ],
+    stl: "libc++_static",
     srcs: [
         "check_vintf.cpp",
     ],