diff --git a/javalib/Android.bp b/javalib/Android.bp
index 1d89059..04ed273 100644
--- a/javalib/Android.bp
+++ b/javalib/Android.bp
@@ -15,9 +15,13 @@
     installable: false,
     compile_dex: true,
 
+    // TODO(b/243512044): introduce non-updatable-framework-module-defaults
+
+    defaults: ["framework-module-defaults"],
+
     shared_library: false,
 
-    // TODO(b/243512044): use framework-module-defaults
+    default_to_stubs: false,
 
     dist_group: "android",
 
@@ -46,6 +50,35 @@
         ],
     },
 
+    public: {
+        enabled: true,
+        sdk_version: "module_current",
+    },
+
+    system: {
+        enabled: true,
+        sdk_version: "module_current",
+    },
+
+    module_lib: {
+        enabled: true,
+        sdk_version: "module_current",
+    },
+
+    test: {
+        enabled: true,
+        sdk_version: "module_current",
+    },
+
+    sdk_version: "core_platform",
+    platform_apis: true,
+    impl_only_libs: [
+        "framework",
+    ],
+    impl_library_visibility: [
+        "//frameworks/base",
+    ],
+
     // Temporary workaround, will be removed in a follow-up child cl.
     unsafe_ignore_missing_latest_api: true,
 }
diff --git a/javalib/api/module-lib-current.txt b/javalib/api/module-lib-current.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/javalib/api/module-lib-current.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/javalib/api/module-lib-removed.txt b/javalib/api/module-lib-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/javalib/api/module-lib-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/virtualizationservice/aidl/Android.bp b/virtualizationservice/aidl/Android.bp
index 4d5326a..da237f8 100644
--- a/virtualizationservice/aidl/Android.bp
+++ b/virtualizationservice/aidl/Android.bp
@@ -39,6 +39,9 @@
     imports: ["android.system.virtualizationcommon"],
     unstable: true,
     backend: {
+        java: {
+            sdk_version: "module_current",
+        },
         rust: {
             enabled: true,
             apex_available: [
@@ -55,6 +58,7 @@
     unstable: true,
     backend: {
         java: {
+            sdk_version: "module_current",
             apex_available: ["com.android.virt"],
         },
         ndk: {