diff --git a/staticlibs/netd/Android.bp b/staticlibs/netd/Android.bp
index 85a756c..6bc7c01 100644
--- a/staticlibs/netd/Android.bp
+++ b/staticlibs/netd/Android.bp
@@ -53,6 +53,7 @@
     min_sdk_version: "29",
 }
 
+// TODO: delete this one when AOSP is no longer auto-merge to git_sc-mainline-prod.
 cc_library_static {
     name: "netd_aidl_interface-lateststable-cpp",
     whole_static_libs: [
@@ -60,6 +61,16 @@
     ],
 }
 
+cc_defaults {
+    name: "netd_aidl_interface_lateststable_cpp_static",
+    static_libs: ["netd_aidl_interface-V8-cpp"],
+}
+
+cc_defaults {
+    name: "netd_aidl_interface_lateststable_cpp_shared",
+    shared_libs: ["netd_aidl_interface-V8-cpp"],
+}
+
 aidl_interface {
     name: "netd_aidl_interface",
     local_include_dir: "binder",