Merge "SdkTestCore for non-updatable modules" into main

api/StubLibraries.bp

@@ -522,6 +522,22 @@ java_library {
     },
 }
 
+java_library {
+    name: "android_test_frameworks_core_stubs_current.from-source",
+    static_libs: [
+        "all-updatable-modules-system-stubs",
+        "android-non-updatable.stubs.test",
+        "private-stub-annotations-jar",
+    ],
+    defaults: [
+        "android.jar_defaults",
+        "android_stubs_dists_default",
+    ],
+    dist: {
+        dir: "apistubs/android/test-core",
+    },
+}
+
 java_library {
     name: "android_module_lib_stubs_current.from-source",
     defaults: [

api/api.go

@@ -393,6 +393,7 @@ func createFullApiLibraries(ctx android.LoadHookContext) {
 		"android_stubs_current",
 		"android_system_stubs_current",
 		"android_test_stubs_current",
+		"android_test_frameworks_core_stubs_current",
 		"android_module_lib_stubs_current",
 		"android_system_server_stubs_current",
 	}