diff --git a/Android.bp b/Android.bp
index 37cecd1..f8fa281 100644
--- a/Android.bp
+++ b/Android.bp
@@ -26,9 +26,13 @@
         "-Wextra",
     ],
     defaults: ["libapexutil-deps"],
+    shared_libs: [
+        // Because the runtime apex depends on the shared libbase,
+        // linkerconfig can use it as shared as well to save more bits.
+        "libbase",
+    ],
     static_libs: [
         "libapexutil",
-        "libbase",
         "liblog_for_runtime_apex",
         "libprotobuf-cpp-lite",
         "libtinyxml2",
@@ -67,7 +71,6 @@
     ],
     generated_sources: ["apex-info-list-tinyxml"],
     apex_available: [
-        "//apex_available:platform",
         "com.android.runtime",
     ],
 }
@@ -87,7 +90,6 @@
         "contents/common/*.cc",
     ],
     apex_available: [
-        "//apex_available:platform",
         "com.android.runtime",
     ],
 }
@@ -104,7 +106,6 @@
         "generator/*.cc",
     ],
     apex_available: [
-        "//apex_available:platform",
         "com.android.runtime",
     ],
 }
@@ -130,8 +131,14 @@
     ],
     target: {
         host: {
-            // Link libc++ statically on host for convenience(no need to set library paths)
+            // Link libc++ and libbase statically on host for convenience(no need to set library paths)
             stl: "c++_static",
+            static_libs: [
+                "libbase",
+            ],
+            exclude_shared_libs: [
+                "libbase",
+            ],
         },
     },
 
@@ -142,7 +149,6 @@
     },
 
     apex_available: [
-        "//apex_available:platform",
         "com.android.runtime",
     ],
 }